Commit d0011693 authored by Phil Hughes's avatar Phil Hughes

Merge branch 'leipert-upgrade-jest' into 'master'

Upgrade jest and related dependencies

Closes #54834

See merge request gitlab-org/gitlab-ce!25597
parents c6fdb76c c151ceba
......@@ -40,8 +40,7 @@ if (BABEL_ENV === 'karma' || BABEL_ENV === 'coverage') {
// Jest is running in node environment
if (BABEL_ENV === 'jest') {
plugins.push('transform-es2015-modules-commonjs');
plugins.push('dynamic-import-node');
plugins.push('@babel/plugin-transform-modules-commonjs');
}
module.exports = { presets, plugins };
......@@ -29,7 +29,7 @@ module.exports = {
cacheDirectory: '<rootDir>/tmp/cache/jest',
modulePathIgnorePatterns: ['<rootDir>/.yarn-cache/'],
reporters,
setupTestFrameworkScriptFile: '<rootDir>/spec/frontend/test_setup.js',
setupFilesAfterEnv: ['<rootDir>/spec/frontend/test_setup.js'],
restoreMocks: true,
transform: {
'^.+\\.(gql|graphql)$': 'jest-transform-graphql',
......
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment