Run legacy tests last to avoid global pollution

duckduckgo · Jul 5, 2023 · 3f79436 · 3f79436
1 parent 542a691
commit 3f79436
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -67,7 +67,7 @@ watch:
 .PHONY: watch
 
 ## unit-test: Run the unit tests.
-ESBUILD_TESTS = unit-test/shared-utils/*.js unit-test/ui/**/*.js unit-test/background/*.js unit-test/background/**/*.js
+ESBUILD_TESTS = unit-test/background/*.js unit-test/background/**/*.js unit-test/ui/**/*.js unit-test/shared-utils/*.js
 unit-test: build/test/legacy-background.js
 	$(ESBUILD) --outdir=build/test --inject:./unit-test/inject-chrome-shim.js $(ESBUILD_TESTS)
 	node_modules/.bin/karma start karma.conf.js

diff --git a/karma.conf.js b/karma.conf.js
@@ -5,7 +5,7 @@ module.exports = function (config) {
         basePath: 'build/test/',
         frameworks: ['jasmine', 'source-map-support'],
         singleRun: true,
-        files: ['*.js', '**/*.js'],
+        files: ['background/*.js', 'background/**/*.js', 'shared-utils/*.js', 'ui/**/*.js', 'legacy-background.js'],
         logLevel: config.LOG_ERROR,
         browserConsoleLogOptions: {
             level: 'warn'

diff --git a/package.json b/package.json
@@ -14,7 +14,7 @@
         "eslint": "eslint '*.js' shared/js shared/data unit-test integration-test scripts",
         "eslint-fix": "npm run eslint -- --fix",
         "lint": "npm run eslint && npm run tsc",
-        "test": "make unit-test",
+        "test": "make -j2 unit-test",
         "playwright": "make dev browser=chrome type=dev && playwright test",
         "playwright-mv3": "make dev browser=chrome-mv3 type=dev && PW_EXPERIMENTAL_SERVICE_WORKER_NETWORK_EVENTS=1 playwright test",
         "tsc": "tsc",

diff --git a/unit-test/inject-chrome-shim.js b/unit-test/inject-chrome-shim.js
@@ -36,4 +36,7 @@ const chrome = {
         updateSessionRules () { }
     }
 }
-export { chrome as 'globalThis.chrome', chrome }
+export {
+    chrome as 'globalThis.chrome', 
+    chrome
+}
diff --git a/...est/ui/pages/mixins/parse-query-string.js → unit-test/ui/helpers/parse-query-string.js b/...est/ui/pages/mixins/parse-query-string.js → unit-test/ui/helpers/parse-query-string.js
@@ -1,4 +1,4 @@
-let parseQueryString = require('../../../../shared/js/ui/pages/mixins/parse-query-string')
+let parseQueryString = require('../../../shared/js/ui/pages/mixins/parse-query-string')
 parseQueryString = parseQueryString.parseQueryString
 
 const tests = [