Fixes #28422 - use jest instead jest-cli

theforeman · Dec 4, 2019 · bae2120 · bae2120
1 parent a886294
commit bae2120
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/config/jest.config.js b/config/jest.config.js
@@ -18,11 +18,11 @@ module.exports = {
   unmockedModulePathPatterns: ['react', 'node_modules/'],
   moduleNameMapper: {
     '^.+\\.(png|gif|css|scss)$': 'identity-obj-proxy',
-    "^dnd-core$": "dnd-core/dist/cjs/index.js",
-    "^react-dnd$": "react-dnd/dist/cjs/index.js",
-    "^react-dnd-html5-backend$": "react-dnd-html5-backend/dist/cjs/index.js",
-    "^react-dnd-test-backend$": "react-dnd-test-backend/dist/cjs/index.js",
-    "^react-dnd-test-utils$": "react-dnd-test-utils/dist/cjs/index.js"
+    '^dnd-core$': 'dnd-core/dist/cjs/index.js',
+    '^react-dnd$': 'react-dnd/dist/cjs/index.js',
+    '^react-dnd-html5-backend$': 'react-dnd-html5-backend/dist/cjs/index.js',
+    '^react-dnd-test-backend$': 'react-dnd-test-backend/dist/cjs/index.js',
+    '^react-dnd-test-utils$': 'react-dnd-test-utils/dist/cjs/index.js',
   },
   globals: {
     __testing__: true,
@@ -31,7 +31,10 @@ module.exports = {
   transform: {
     '^.+\\.js$': 'babel-jest',
   },
-  moduleDirectories: ['node_modules/@theforeman/vendor-core/node_modules', 'node_modules'],
+  moduleDirectories: [
+    'node_modules/@theforeman/vendor-core/node_modules',
+    'node_modules',
+  ],
   setupFiles: [
     'raf/polyfill',
     'jest-prop-type-error',

diff --git a/package.json b/package.json
@@ -8,7 +8,7 @@
     "lint": "./node_modules/.bin/eslint -c .eslintrc webpack/ script/",
     "foreman-js:link": "./script/npm_link_foreman_js.sh",
     "postlint": "./script/npm_lint_plugins.js",
-    "test": "node --max_old_space_size=8192 node_modules/.bin/jest --no-cache --config config/jest.config.js",
+    "test": "jest --config config/jest.config.js",
     "test:watch": "node node_modules/.bin/jest --watchAll --config config/jest.config.js",
     "test:current": "node node_modules/.bin/jest --watch --config config/jest.config.js",
     "coveralls": "cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js",
@@ -60,7 +60,7 @@
     "file-loader": "^0.9.0",
     "highlight.js": "~9.14.0",
     "identity-obj-proxy": "^3.0.0",
-    "jest-cli": "^24.9.0",
+    "jest": "^24.9.0",
     "jest-prop-type-error": "^1.1.0",
     "node-sass": "^4.5.0",
     "prettier": "^1.19.1",