Skip to content

Commit 2b8b2dc

Browse files
Upgrade Karma/Sauce-related packages to fix #36780 (#36802)
1 parent 302cfd9 commit 2b8b2dc

File tree

3 files changed

+2027
-736
lines changed

3 files changed

+2027
-736
lines changed

src/SignalR/clients/ts/FunctionalTests/package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,24 +11,24 @@
1111
"devDependencies": {
1212
"@types/debug": "0.0.30",
1313
"@types/jasmine": "^2.8.8",
14-
"@types/karma": "^1.7.5",
14+
"@types/karma": "^6.3.1",
1515
"@types/node": "^9.6.28",
1616
"debug": "^3.1.0",
1717
"es6-promise": "^4.2.4",
1818
"jasmine": "^3.2.0",
1919
"jasmine-core": "^3.2.1",
20-
"karma": "^4.4.1",
21-
"karma-chrome-launcher": "^2.2.0",
20+
"karma": "^6.3.4",
21+
"karma-chrome-launcher": "^3.1.0",
2222
"karma-edge-launcher": "^0.4.2",
23-
"karma-firefox-launcher": "^1.3.0",
23+
"karma-firefox-launcher": "^2.1.1",
2424
"karma-ie-launcher": "^1.0.0",
25-
"karma-jasmine": "^3.1.0",
26-
"karma-junit-reporter": "^1.2.0",
25+
"karma-jasmine": "^4.0.1",
26+
"karma-junit-reporter": "^2.0.1",
2727
"karma-mocha-reporter": "^2.2.5",
2828
"karma-safari-launcher": "^1.0.0",
29-
"karma-sauce-launcher": "^1.2.0",
29+
"karma-sauce-launcher": "^4.3.6",
3030
"karma-sourcemap-loader": "^0.3.7",
31-
"karma-summary-reporter": "^1.6.0",
31+
"karma-summary-reporter": "^3.0.0",
3232
"process": "^0.11.10",
3333
"rxjs": "^6.3.3",
3434
"ts-node": "^8.6.2",

src/SignalR/clients/ts/FunctionalTests/scripts/run-tests.ts

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -194,19 +194,6 @@ if (sauce) {
194194
}
195195
}
196196

197-
// Workaround for 'wd' not installing correctly. https://github.com/karma-runner/karma-sauce-launcher/issues/117
198-
function ensureWdInstalled() {
199-
return new Promise((resolve, reject) => {
200-
exec(`node ${__dirname}/../node_modules/wd/scripts/build-browser-scripts.js`, { timeout: 30000 }, (error: any, stdout, stderr) => {
201-
if (error) {
202-
console.log(error.message);
203-
reject(error);
204-
}
205-
resolve();
206-
});
207-
});
208-
}
209-
210197
function runKarma(karmaConfig) {
211198
return new Promise<number>((resolve, reject) => {
212199
const server = new karma.Server(karmaConfig, (exitCode: number) => {
@@ -299,8 +286,6 @@ function runJest(httpsUrl: string, httpUrl: string) {
299286

300287
debug(`Functional Test Server has started at ${httpsUrl} and ${httpUrl}`);
301288

302-
await ensureWdInstalled();
303-
304289
// Start karma server
305290
const conf = {
306291
...config,

0 commit comments

Comments
 (0)