summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKushal Pandya <kushalspandya@gmail.com>2019-05-13 15:17:50 +0000
committerKushal Pandya <kushalspandya@gmail.com>2019-05-13 15:17:50 +0000
commit28ccc241782d2c27b5335ae9111131766dde15c7 (patch)
treed7c32f3714dfb62670af33401d72ed910632f224
parent505ffe56576caf67bedcb20d86a8c8a3e8e4c4b3 (diff)
parent746267a98cee46dfb0f4b2e7eb9ae18127ffdc0c (diff)
downloadgitlab-ce-28ccc241782d2c27b5335ae9111131766dde15c7.tar.gz
Merge branch 'winh-frontend-tests-check-dependencies' into 'master'
Ensure that dependencies are installed before running frontend tests See merge request gitlab-org/gitlab-ce!28236
-rw-r--r--package.json4
1 files changed, 4 insertions, 0 deletions
diff --git a/package.json b/package.json
index eb557101662..f19baac0229 100644
--- a/package.json
+++ b/package.json
@@ -1,13 +1,17 @@
{
"private": true,
"scripts": {
+ "check-dependencies": "yarn check --integrity",
"clean": "rm -rf public/assets tmp/cache/*-loader",
"dev-server": "NODE_OPTIONS=\"--max-old-space-size=3584\" nodemon -w 'config/webpack.config.js' --exec 'webpack-dev-server --config config/webpack.config.js'",
"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 .",
+ "prejest": "yarn check-dependencies",
+ "jest": "jest",
"jest-debug": "node --inspect-brk node_modules/.bin/jest --runInBand",
"jsdoc": "jsdoc -c config/jsdocs.config.js",
+ "prekarma": "yarn check-dependencies",
"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",