Modified test script calls

galaxyproject · Nov 2, 2018 · b637c75 · b637c75
1 parent 2cc0417
commit b637c75
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -161,10 +161,10 @@ client-watch: node-deps ## A useful target for parallel development building.
 	cd client && yarn run watch
 
 _client-test-mocha:  ## Run mocha tests via karma
-	cd client && GALAXY_TEST_FRAMEWORK=mocha yarn run test
+	cd client && yarn run test-mocha
 
 _client-test-qunit:  ## Run qunit tests via karma
-	cd client && GALAXY_TEST_FRAMEWORK=qunit yarn run test
+	cd client && yarn run test-qunit
 
 client-test: client _client-test-mocha _client-test-qunit ## Run JS unit tests via Karma
 

diff --git a/client/karma.config.base.js b/client/karma.config.base.js
@@ -6,6 +6,7 @@ module.exports = {
     webpack: webpackConfig,
     webpackMiddleware: { noInfo: false },
     browsers: ["ChromeHeadlessNoSandbox"],
+    singleRun: true,
     client: {
         captureConsole: true
     },

diff --git a/client/package.json b/client/package.json
@@ -56,8 +56,8 @@
     "webpack-watch": "webpack -d --watch",
     "webpack-production": "webpack -p",
     "webpack-production-maps": "GXY_BUILD_SOURCEMAPS=1 webpack -p",
-    "test": "npm run test-mocha -- --single-run && npm run test-qunit -- --single-run",
-    "test-watch": "npm run test-qunit -- --no-single-run",
+    "test": "npm run test-mocha && npm run test-qunit",
+    "test-watch": "npm run test-mocha -- --no-single-run",
     "test-qunit": "GALAXY_TEST_AS_SINGLE_PACK=true karma start karma.config.qunit.js",
     "test-mocha": "GALAXY_TEST_AS_SINGLE_PACK=true karma start karma.config.mocha.js",
     "gulp": "gulp",
@@ -113,4 +113,4 @@
     "webpack-cli": "^3.1.2",
     "yaml-loader": "^0.5.0"
   }
-}
+}