summaryrefslogtreecommitdiff
path: root/package.json
diff options
context:
space:
mode:
authorClement Ho <clemmakesapps@gmail.com>2019-05-23 17:32:56 +0000
committerClement Ho <clemmakesapps@gmail.com>2019-05-23 17:32:56 +0000
commit57d9f88fd5659da349473e1636f1271b0995c7b0 (patch)
treefe9b356135e0694d90bf7e910edb56aeee496cae /package.json
parentdd454852bc941130820b1c647a8580d56acb2a4f (diff)
parent334cfe472a2c6bc1a13f4971303fd7a89ec3ed5d (diff)
downloadgitlab-ce-57d9f88fd5659da349473e1636f1271b0995c7b0.tar.gz
Merge branch '58869-unified-fe-test-script' into 'master'
Create a unified script to run Jest & Karma tests Closes #58869 See merge request gitlab-org/gitlab-ce!27239
Diffstat (limited to 'package.json')
-rw-r--r--package.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/package.json b/package.json
index 099d0b3d8fa..381accff23b 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
"stylelint": "node node_modules/stylelint/bin/stylelint.js app/assets/stylesheets/**/*.* ee/app/assets/stylesheets/**/*.* !**/vendors/** --custom-formatter node_modules/stylelint-error-string-formatter",
"stylelint-file": "node node_modules/stylelint/bin/stylelint.js",
"stylelint-create-utility-map": "node scripts/frontend/stylelint/stylelint-utility-map.js",
- "test": "yarn jest && yarn karma",
+ "test": "node scripts/frontend/test",
"webpack": "NODE_OPTIONS=\"--max-old-space-size=3584\" webpack --config config/webpack.config.js",
"webpack-prod": "NODE_OPTIONS=\"--max-old-space-size=3584\" NODE_ENV=production webpack --config config/webpack.config.js"
},