diff options
| -rw-r--r-- | jest.config.js (renamed from config/jest.config.js) | 1 | ||||
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | spec/frontend/.eslintrc.yml | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/config/jest.config.js b/jest.config.js index e1b07f21555..0a7b2aedb42 100644 --- a/config/jest.config.js +++ b/jest.config.js @@ -24,5 +24,4 @@ module.exports = { cacheDirectory: '<rootDir>/tmp/cache/jest', modulePathIgnorePatterns: ['<rootDir>/.yarn-cache/'], reporters, - rootDir: '..', // necessary because this file is in the config/ subdirectory }; diff --git a/package.json b/package.json index 7352375f78c..52c211f7afb 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "eslint": "eslint --max-warnings 0 --report-unused-disable-directives --ext .js,.vue .", "eslint-fix": "eslint --max-warnings 0 --report-unused-disable-directives --ext .js,.vue --fix .", "eslint-report": "eslint --max-warnings 0 --ext .js,.vue --format html --output-file ./eslint-report.html --no-inline-config .", - "jest": "BABEL_ENV=jest jest --config=config/jest.config.js", + "jest": "BABEL_ENV=jest jest", "karma": "BABEL_ENV=${BABEL_ENV:=karma} karma start --single-run true config/karma.config.js", "karma-coverage": "BABEL_ENV=coverage karma start --single-run true config/karma.config.js", "karma-start": "BABEL_ENV=karma karma start config/karma.config.js", diff --git a/spec/frontend/.eslintrc.yml b/spec/frontend/.eslintrc.yml index 6d73977a891..046215e4c93 100644 --- a/spec/frontend/.eslintrc.yml +++ b/spec/frontend/.eslintrc.yml @@ -6,4 +6,4 @@ plugins: settings: import/resolver: jest: - jestConfigFile: "config/jest.config.js" + jestConfigFile: "jest.config.js" |