test: fix karma config for karma v6

formatjs · Jan 26, 2021 · 7d94cf7 · 7d94cf7
1 parent bc96356
commit 7d94cf7
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 14 deletions.
diff --git a/BUILD b/BUILD
@@ -174,7 +174,7 @@ karma_test(
         "$(rootpath //:karma.conf.js)",
         "--browsers",
         "ChromeHeadless",
-    ] + ["$$(rlocation $(locations %s))" % f for f in KARMA_TESTS],
+    ],
 )
 
 karma_test(
@@ -197,7 +197,7 @@ karma_test(
         "$(rootpath //:karma.conf.js)",
         "--browsers",
         "sl_edge,sl_chrome,sl_firefox,sl_ie_11,sl_safari",
-    ] + ["$$(rlocation $(locations %s))" % f for f in KARMA_TESTS],
+    ],
 )
 
 multirun(

diff --git a/karma.conf.js b/karma.conf.js
@@ -1,6 +1,3 @@
-// Look at //:BUILD to see why we're slicing 6
-const FILES = process.argv.slice(6);
-
 module.exports = function (config) {
   // Browsers to run on Sauce Labs
   // Check out https://saucelabs.com/platforms for all browser/OS combos
@@ -35,7 +32,7 @@ module.exports = function (config) {
   config.set({
     basePath: '',
     frameworks: ['jasmine', 'jasmine-matchers'],
-    files: FILES,
+    files: ['**/bundled-karma-tests-*.test.bundled.js'],
     reporters: ['progress', 'saucelabs'],
     colors: true,
     concurrency: 5,

diff --git a/package.json b/package.json
@@ -97,7 +97,7 @@
     "karma-chrome-launcher": "^3.1.0",
     "karma-jasmine": "^4.0.0",
     "karma-jasmine-matchers": "^4.0.2",
-    "karma-sauce-launcher": "4.3.4",
+    "karma-sauce-launcher": "4.3.5",
     "lerna": "^3.20.2",
     "lint-staged": "^10.2.11",
     "lodash": "^4.17.15",

diff --git a/yarn.lock b/yarn.lock
@@ -11409,14 +11409,13 @@ karma-jasmine@^4.0.0:
   dependencies:
     jasmine-core "^3.6.0"
 
-karma-sauce-launcher@4.3.4:
-  version "4.3.4"
-  resolved "https://registry.yarnpkg.com/karma-sauce-launcher/-/karma-sauce-launcher-4.3.4.tgz#3033b6cb9610db4b67de074baef58c652d5a11b8"
-  integrity sha512-sXka3l3Z9x+UhGMsg0fU+i+Jq82j7tfApMrAupM8JxO8ZskmSCozUM4cffLTwuzJPYjf0ffFNu3Up5Pzr26N/g==
+karma-sauce-launcher@4.3.5:
+  version "4.3.5"
+  resolved "https://registry.yarnpkg.com/karma-sauce-launcher/-/karma-sauce-launcher-4.3.5.tgz#fd882a182fdd86206c05311a34b674cd4aef7c1c"
+  integrity sha512-a6c8qbuLspMi2KNGQefXe/lhZAd2JSkxheT6kBb3GKwWfyZyjG+eF3C7lFennWHZyzeXHv7pY5LMpi/mHGCzag==
   dependencies:
-    fs-extra "^9.0.1"
     global-agent "^2.1.12"
-    saucelabs "^4.5.1"
+    saucelabs "^4.6.3"
     webdriverio "^6.7.0"
 
 karma@^5.0.2:
@@ -16106,7 +16105,7 @@ sane@^4.0.3:
     minimist "^1.1.1"
     walker "~1.0.5"
 
-saucelabs@^4.5.1:
+saucelabs@^4.6.3:
   version "4.6.3"
   resolved "https://registry.yarnpkg.com/saucelabs/-/saucelabs-4.6.3.tgz#aa07f0b05793863158f08a9f7c87fa0a0b13452b"
   integrity sha512-LQEA7ENXq03MWs5sTbvRPlDiaR9PFEfqiMUHtiXEJQUGQ5JAmIXOB39/4hL3CUvZKZ2Bv7Ook6ZCDsqUFY7Vmw==