Skip to content

Commit bd612ef

Browse files
committed
fix(tests): Fixes Firefox tests excludes.
1 parent b93c69c commit bd612ef

File tree

4 files changed

+14
-76
lines changed

4 files changed

+14
-76
lines changed

package-lock.json

Lines changed: 0 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,6 @@
138138
"@types/js-md5": "0.4.3",
139139
"@types/jsonwebtoken": "9.0.7",
140140
"@types/lodash-es": "4.17.12",
141-
"@types/minimatch": "5.1.2",
142141
"@types/mocha": "10.0.10",
143142
"@types/offscreencanvas": "2019.7.2",
144143
"@types/pixelmatch": "5.2.5",

tests/wdio.conf.ts

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import AllureReporter from '@wdio/allure-reporter';
22
import { multiremotebrowser } from '@wdio/globals';
33
import { Buffer } from 'buffer';
4-
import minimatch from 'minimatch';
54
import path from 'node:path';
65
import process from 'node:process';
76
import pretty from 'pretty';
@@ -298,26 +297,6 @@ export const config: WebdriverIO.MultiremoteConfig = {
298297
});
299298
},
300299

301-
/**
302-
* Gets executed before a worker process is spawned and can be used to initialize specific service
303-
* for that worker as well as modify runtime environments in an async fashion.
304-
*/
305-
onWorkerStart(...args) {
306-
// We run a worker per suite, and replay on this logic here
307-
if (args[2].length > 1) {
308-
console.warn('Our worker is supposed to get a single suite, but got more than one');
309-
310-
return;
311-
}
312-
313-
// We skip the suite tests if the suite is marked as such, we used that from firefox overwrite
314-
// @ts-ignore
315-
if (config?.ffExcludes?.some(
316-
(e: string) => minimatch(args[2][0].replace('file://', ''), `${__dirname}/${e}`))) {
317-
args[2].pop();
318-
}
319-
},
320-
321300
/**
322301
* Function to be executed after a test (in Mocha/Jasmine only).
323302
*

tests/wdio.firefox.conf.ts

Lines changed: 14 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -19,23 +19,21 @@ if (process.env.HEADLESS === 'true') {
1919
ffArgs.push('--headless');
2020
}
2121

22-
const ffExcludes = [
23-
'specs/**/iFrameApi*.spec.ts', // FF does not support uploading files (uploadFile)
24-
25-
// FF does not support setting a file as mic input, no dominant speaker events
26-
'specs/3way/activeSpeaker.spec.ts',
27-
'specs/3way/startMuted.spec.ts', // bad audio levels
28-
'specs/4way/desktopSharing.spec.ts',
29-
'specs/4way/lastN.spec.ts',
30-
31-
// when unmuting a participant, we see the presence in debug logs imidiately,
32-
// but for 15 seconds it is not received/processed by the client
33-
// (also menu disappears after clicking one of the moderation option, does not happen manually)
34-
'specs/3way/audioVideoModeration.spec.ts'
35-
];
36-
3722
const mergedConfig = merge(defaultConfig, {
38-
ffExcludes,
23+
exclude: [
24+
'specs/**/iFrameApi*.spec.ts', // FF does not support uploading files (uploadFile)
25+
26+
// FF does not support setting a file as mic input, no dominant speaker events
27+
'specs/3way/activeSpeaker.spec.ts',
28+
'specs/3way/startMuted.spec.ts', // bad audio levels
29+
'specs/4way/desktopSharing.spec.ts',
30+
'specs/4way/lastN.spec.ts',
31+
32+
// when unmuting a participant, we see the presence in debug logs imidiately,
33+
// but for 15 seconds it is not received/processed by the client
34+
// (also the menu disappears after clicking one of the moderation options, does not happen manually)
35+
'specs/3way/audioVideoModeration.spec.ts'
36+
],
3937
capabilities: {
4038
p1: {
4139
capabilities: {
@@ -47,30 +45,6 @@ const mergedConfig = merge(defaultConfig, {
4745
},
4846
acceptInsecureCerts: process.env.ALLOW_INSECURE_CERTS === 'true'
4947
}
50-
},
51-
p2: {
52-
capabilities: {
53-
'wdio:exclude': [
54-
...defaultConfig.capabilities.p2.capabilities['wdio:exclude'],
55-
...ffExcludes
56-
]
57-
}
58-
},
59-
p3: {
60-
capabilities: {
61-
'wdio:exclude': [
62-
...defaultConfig.capabilities.p3.capabilities['wdio:exclude'],
63-
...ffExcludes
64-
]
65-
}
66-
},
67-
p4: {
68-
capabilities: {
69-
'wdio:exclude': [
70-
...defaultConfig.capabilities.p4.capabilities['wdio:exclude'],
71-
...ffExcludes
72-
]
73-
}
7448
}
7549
}
7650
}, { clone: false });

0 commit comments

Comments
 (0)