diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2019-03-20 15:49:12 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2019-03-20 15:49:12 +0000 |
| commit | c238ba7f73e5905b9a216e6bbbfc230392a24958 (patch) | |
| tree | ef5f79706e88a6e333207671d77ff0f7fe8b2f51 | |
| parent | 75e24b8f506444bfdac57fd0d8d691e49fb77dc1 (diff) | |
| parent | 4fca4b79f5a9fa536bb0148e915dd918b42022f1 (diff) | |
| download | gitlab-ce-c238ba7f73e5905b9a216e6bbbfc230392a24958.tar.gz | |
Merge branch 'winh-yarn-test-command' into 'master'
Introduce yarn test to run Jest and Karma
See merge request gitlab-org/gitlab-ce!26320
| -rw-r--r-- | doc/development/testing_guide/frontend_testing.md | 10 | ||||
| -rw-r--r-- | package.json | 1 |
2 files changed, 5 insertions, 6 deletions
diff --git a/doc/development/testing_guide/frontend_testing.md b/doc/development/testing_guide/frontend_testing.md index 3634e648219..71c9637e72c 100644 --- a/doc/development/testing_guide/frontend_testing.md +++ b/doc/development/testing_guide/frontend_testing.md @@ -225,14 +225,12 @@ See this [section][vue-test]. ### Running frontend tests -`rake karma` runs the frontend-only (JavaScript) tests. -It consists of two subtasks: +For running the frontend tests, you need the following commands: -- `rake karma:fixtures` (re-)generates fixtures -- `rake karma:tests` actually executes the tests +- `rake karma:fixtures` (re-)generates fixtures. +- `yarn test` executes the tests. -As long as the fixtures don't change, `rake karma:tests` (or `yarn karma`) -is sufficient (and saves you some time). +As long as the fixtures don't change, `yarn test` is sufficient (and saves you some time). ### Live testing and focused testing diff --git a/package.json b/package.json index fa980fa173e..d830d83b963 100644 --- a/package.json +++ b/package.json @@ -17,6 +17,7 @@ "prettier-all": "node ./scripts/frontend/prettier.js check-all", "prettier-all-save": "node ./scripts/frontend/prettier.js save-all", "stylelint": "node node_modules/stylelint/bin/stylelint.js app/assets/stylesheets/**/*.* --custom-formatter node_modules/stylelint-error-string-formatter", + "test": "yarn jest && yarn karma", "webpack": "webpack --config config/webpack.config.js", "webpack-prod": "NODE_ENV=production webpack --config config/webpack.config.js" }, |