Commit 8253d022 authored by Paul Slaughter's avatar Paul Slaughter

Merge branch 'dmishunov-fixing-jest-config-for-ides' into 'master'

Fixing the JEST config for IDEs

See merge request gitlab-org/gitlab!32546
parents 5841b44b fa9028e0
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
/scripts/ /scripts/
/tmp/ /tmp/
/vendor/ /vendor/
jest.config.js
jest.config.*.js jest.config.*.js
karma.config.js karma.config.js
webpack.config.js webpack.config.js
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
"eslint-report": "eslint --max-warnings 0 --ext .js,.vue --format html --output-file ./eslint-report.html --no-inline-config .", "eslint-report": "eslint --max-warnings 0 --ext .js,.vue --format html --output-file ./eslint-report.html --no-inline-config .",
"file-coverage": "scripts/frontend/file_test_coverage.js", "file-coverage": "scripts/frontend/file_test_coverage.js",
"prejest": "yarn check-dependencies", "prejest": "yarn check-dependencies",
"jest": "jest --config jest.config.unit.js", "jest": "jest --config jest.config.js",
"jest-debug": "node --inspect-brk node_modules/.bin/jest --runInBand", "jest-debug": "node --inspect-brk node_modules/.bin/jest --runInBand",
"jest:integration": "jest --config jest.config.integration.js", "jest:integration": "jest --config jest.config.integration.js",
"jsdoc": "jsdoc -c config/jsdocs.config.js", "jsdoc": "jsdoc -c config/jsdocs.config.js",
......
...@@ -10,7 +10,7 @@ settings: ...@@ -10,7 +10,7 @@ settings:
- path - path
import/resolver: import/resolver:
jest: jest:
jestConfigFile: 'jest.config.unit.js' jestConfigFile: 'jest.config.js'
globals: globals:
getJSONFixture: false getJSONFixture: false
loadFixtures: false loadFixtures: false
......
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