From 29d4c69e5716168cfc23c2230f77de083eee6199 Mon Sep 17 00:00:00 2001
From: "Kyle D. McCormick" <kyle@axim.org>
Date: Fri, 13 Dec 2024 15:46:39 -0500
Subject: [PATCH] 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.
---
 package.json | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/package.json b/package.json
index 2f09f8a7df9..8ed93a32263 100644
--- a/package.json
+++ b/package.json
@@ -14,24 +14,25 @@
     "watch-webpack": "npm run webpack-dev -- --watch",
     "watch-sass": "scripts/watch_sass.sh",
     "lint": "python scripts/eslint.py",
-    "test": "npm run test-cms && npm run test-lms && npm run test-xmodule && npm run test-common && npm run test-jest",
-    "test-kind-vanilla": "npm run test-cms-vanilla && npm run test-xmodule-vanilla && npm run test-common-vanilla",
-    "test-kind-require": "npm run test-cms-require && npm run test-common-require",
-    "test-kind-webpack": "npm run test-cms-webpack && npm run test-lms-webpack && npm run test-xmodule-webpack",
-    "test-cms": "npm run test-cms-vanilla && npm run test-cms-require",
-    "test-cms-vanilla": "npm run test-suite -- cms/static/karma_cms.conf.js",
-    "test-cms-require": "npm run test-suite -- cms/static/karma_cms_squire.conf.js",
-    "test-cms-webpack": "npm run test-suite -- cms/static/karma_cms_webpack.conf.js",
-    "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.'",
-    "test-lms-webpack": "npm run test-suite -- lms/static/karma_lms.conf.js",
-    "test-xmodule": "npm run test-xmodule-vanilla",
-    "test-xmodule-vanilla": "npm run test-suite -- xmodule/js/karma_xmodule.conf.js",
-    "test-xmodule-webpack": "npm run test-suite -- xmodule/js/karma_xmodule_webpack.conf.js",
+    "test": "npm run test-jest && npm run test-karma",
+    "test-jest": "jest",
+    "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'",
+    "test-karma-vanilla": "npm run test-cms-vanilla && npm run test-xmodule-vanilla && npm run test-common-vanilla",
+    "test-karma-require": "npm run test-cms-require && npm run test-common-require",
+    "test-karma-webpack": "npm run test-cms-webpack && npm run test-lms-webpack && npm run test-xmodule-webpack",
+    "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",
+    "test-cms": "npm run test-cms-vanilla && npm run test-cms-require && npm run test-cms-webpack",
+    "test-cms-vanilla": "npm run test-karma-conf -- cms/static/karma_cms.conf.js",
+    "test-cms-require": "npm run test-karma-conf -- cms/static/karma_cms_squire.conf.js",
+    "test-cms-webpack": "npm run test-karma-conf -- cms/static/karma_cms_webpack.conf.js",
+    "test-lms": "npm run test-jest && npm run test-lms-webpack",
+    "test-lms-webpack": "npm run test-karma-conf -- lms/static/karma_lms.conf.js",
+    "test-xmodule": "npm run test-xmodule-vanilla && npm run test-xmodule-webpack",
+    "test-xmodule-vanilla": "npm run test-karma-conf -- xmodule/js/karma_xmodule.conf.js",
+    "test-xmodule-webpack": "npm run test-karma-conf -- xmodule/js/karma_xmodule_webpack.conf.js",
     "test-common": "npm run test-common-vanilla && npm run test-common-require",
-    "test-common-vanilla": "npm run test-suite -- common/static/karma_common.conf.js",
-    "test-common-require": "npm run test-suite -- common/static/karma_common_requirejs.conf.js",
-    "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",
-    "test-jest": "jest"
+    "test-common-vanilla": "npm run test-karma-conf -- common/static/karma_common.conf.js",
+    "test-common-require": "npm run test-karma-conf -- common/static/karma_common_requirejs.conf.js"
   },
   "dependencies": {
     "@babel/core": "7.26.0",