Skip to content

Commit 29d4c69

Browse files
committed
build!: Rejigger "npm run test" to be more intuitive
This is technically a breaking change, but these commands were added a week ago and were not yet documented, so I'm not worried about breaking anyone's workflow with this commit.
1 parent 41d28f3 commit 29d4c69

1 file changed

Lines changed: 18 additions & 17 deletions

File tree

package.json

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -14,24 +14,25 @@
1414
"watch-webpack": "npm run webpack-dev -- --watch",
1515
"watch-sass": "scripts/watch_sass.sh",
1616
"lint": "python scripts/eslint.py",
17-
"test": "npm run test-cms && npm run test-lms && npm run test-xmodule && npm run test-common && npm run test-jest",
18-
"test-kind-vanilla": "npm run test-cms-vanilla && npm run test-xmodule-vanilla && npm run test-common-vanilla",
19-
"test-kind-require": "npm run test-cms-require && npm run test-common-require",
20-
"test-kind-webpack": "npm run test-cms-webpack && npm run test-lms-webpack && npm run test-xmodule-webpack",
21-
"test-cms": "npm run test-cms-vanilla && npm run test-cms-require",
22-
"test-cms-vanilla": "npm run test-suite -- cms/static/karma_cms.conf.js",
23-
"test-cms-require": "npm run test-suite -- cms/static/karma_cms_squire.conf.js",
24-
"test-cms-webpack": "npm run test-suite -- cms/static/karma_cms_webpack.conf.js",
25-
"test-lms": "echo 'WARNING: Webpack JS tests are disabled. No LMS JS tests will be run. See https://github.com/openedx/edx-platform/issues/35956 for details.'",
26-
"test-lms-webpack": "npm run test-suite -- lms/static/karma_lms.conf.js",
27-
"test-xmodule": "npm run test-xmodule-vanilla",
28-
"test-xmodule-vanilla": "npm run test-suite -- xmodule/js/karma_xmodule.conf.js",
29-
"test-xmodule-webpack": "npm run test-suite -- xmodule/js/karma_xmodule_webpack.conf.js",
17+
"test": "npm run test-jest && npm run test-karma",
18+
"test-jest": "jest",
19+
"test-karma": "npm run test-karma-vanilla && npm run test-karma-require && echo 'WARNING: Skipped broken webpack tests. For details, see: https://github.com/openedx/edx-platform/issues/35956'",
20+
"test-karma-vanilla": "npm run test-cms-vanilla && npm run test-xmodule-vanilla && npm run test-common-vanilla",
21+
"test-karma-require": "npm run test-cms-require && npm run test-common-require",
22+
"test-karma-webpack": "npm run test-cms-webpack && npm run test-lms-webpack && npm run test-xmodule-webpack",
23+
"test-karma-conf": "${NODE_WRAPPER:-xvfb-run --auto-servernum} node --max_old_space_size=4096 node_modules/.bin/karma start --single-run=true --capture-timeout=60000 --browsers=FirefoxNoUpdates",
24+
"test-cms": "npm run test-cms-vanilla && npm run test-cms-require && npm run test-cms-webpack",
25+
"test-cms-vanilla": "npm run test-karma-conf -- cms/static/karma_cms.conf.js",
26+
"test-cms-require": "npm run test-karma-conf -- cms/static/karma_cms_squire.conf.js",
27+
"test-cms-webpack": "npm run test-karma-conf -- cms/static/karma_cms_webpack.conf.js",
28+
"test-lms": "npm run test-jest && npm run test-lms-webpack",
29+
"test-lms-webpack": "npm run test-karma-conf -- lms/static/karma_lms.conf.js",
30+
"test-xmodule": "npm run test-xmodule-vanilla && npm run test-xmodule-webpack",
31+
"test-xmodule-vanilla": "npm run test-karma-conf -- xmodule/js/karma_xmodule.conf.js",
32+
"test-xmodule-webpack": "npm run test-karma-conf -- xmodule/js/karma_xmodule_webpack.conf.js",
3033
"test-common": "npm run test-common-vanilla && npm run test-common-require",
31-
"test-common-vanilla": "npm run test-suite -- common/static/karma_common.conf.js",
32-
"test-common-require": "npm run test-suite -- common/static/karma_common_requirejs.conf.js",
33-
"test-suite": "${NODE_WRAPPER:-xvfb-run --auto-servernum} node --max_old_space_size=4096 node_modules/.bin/karma start --single-run=true --capture-timeout=60000 --browsers=FirefoxNoUpdates",
34-
"test-jest": "jest"
34+
"test-common-vanilla": "npm run test-karma-conf -- common/static/karma_common.conf.js",
35+
"test-common-require": "npm run test-karma-conf -- common/static/karma_common_requirejs.conf.js"
3536
},
3637
"dependencies": {
3738
"@babel/core": "7.26.0",

0 commit comments

Comments
 (0)