From bd612ef8eaa01159dd849c8d768acaff790dc40d Mon Sep 17 00:00:00 2001 From: damencho Date: Fri, 20 Jun 2025 08:13:14 -0500 Subject: [PATCH] fix(tests): Fixes Firefox tests excludes. --- package-lock.json | 14 ---------- package.json | 1 - tests/wdio.conf.ts | 21 --------------- tests/wdio.firefox.conf.ts | 54 ++++++++++---------------------------- 4 files changed, 14 insertions(+), 76 deletions(-) diff --git a/package-lock.json b/package-lock.json index 28a261251e..84a3e9b4be 100644 --- a/package-lock.json +++ b/package-lock.json @@ -132,7 +132,6 @@ "@types/js-md5": "0.4.3", "@types/jsonwebtoken": "9.0.7", "@types/lodash-es": "4.17.12", - "@types/minimatch": "5.1.2", "@types/mocha": "10.0.10", "@types/offscreencanvas": "2019.7.2", "@types/pixelmatch": "5.2.5", @@ -7355,13 +7354,6 @@ "integrity": "sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==", "dev": true }, - "node_modules/@types/minimatch": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-5.1.2.tgz", - "integrity": "sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==", - "dev": true, - "license": "MIT" - }, "node_modules/@types/mocha": { "version": "10.0.10", "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-10.0.10.tgz", @@ -31187,12 +31179,6 @@ "integrity": "sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==", "dev": true }, - "@types/minimatch": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-5.1.2.tgz", - "integrity": "sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==", - "dev": true - }, "@types/mocha": { "version": "10.0.10", "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-10.0.10.tgz", diff --git a/package.json b/package.json index b0c9acb313..d072ad7f98 100644 --- a/package.json +++ b/package.json @@ -138,7 +138,6 @@ "@types/js-md5": "0.4.3", "@types/jsonwebtoken": "9.0.7", "@types/lodash-es": "4.17.12", - "@types/minimatch": "5.1.2", "@types/mocha": "10.0.10", "@types/offscreencanvas": "2019.7.2", "@types/pixelmatch": "5.2.5", diff --git a/tests/wdio.conf.ts b/tests/wdio.conf.ts index ffebfd0801..1791a07650 100644 --- a/tests/wdio.conf.ts +++ b/tests/wdio.conf.ts @@ -1,7 +1,6 @@ import AllureReporter from '@wdio/allure-reporter'; import { multiremotebrowser } from '@wdio/globals'; import { Buffer } from 'buffer'; -import minimatch from 'minimatch'; import path from 'node:path'; import process from 'node:process'; import pretty from 'pretty'; @@ -298,26 +297,6 @@ export const config: WebdriverIO.MultiremoteConfig = { }); }, - /** - * Gets executed before a worker process is spawned and can be used to initialize specific service - * for that worker as well as modify runtime environments in an async fashion. - */ - onWorkerStart(...args) { - // We run a worker per suite, and replay on this logic here - if (args[2].length > 1) { - console.warn('Our worker is supposed to get a single suite, but got more than one'); - - return; - } - - // We skip the suite tests if the suite is marked as such, we used that from firefox overwrite - // @ts-ignore - if (config?.ffExcludes?.some( - (e: string) => minimatch(args[2][0].replace('file://', ''), `${__dirname}/${e}`))) { - args[2].pop(); - } - }, - /** * Function to be executed after a test (in Mocha/Jasmine only). * diff --git a/tests/wdio.firefox.conf.ts b/tests/wdio.firefox.conf.ts index f9e2bf23c5..d16132cc02 100644 --- a/tests/wdio.firefox.conf.ts +++ b/tests/wdio.firefox.conf.ts @@ -19,23 +19,21 @@ if (process.env.HEADLESS === 'true') { ffArgs.push('--headless'); } -const ffExcludes = [ - 'specs/**/iFrameApi*.spec.ts', // FF does not support uploading files (uploadFile) - - // FF does not support setting a file as mic input, no dominant speaker events - 'specs/3way/activeSpeaker.spec.ts', - 'specs/3way/startMuted.spec.ts', // bad audio levels - 'specs/4way/desktopSharing.spec.ts', - 'specs/4way/lastN.spec.ts', - - // when unmuting a participant, we see the presence in debug logs imidiately, - // but for 15 seconds it is not received/processed by the client - // (also menu disappears after clicking one of the moderation option, does not happen manually) - 'specs/3way/audioVideoModeration.spec.ts' -]; - const mergedConfig = merge(defaultConfig, { - ffExcludes, + exclude: [ + 'specs/**/iFrameApi*.spec.ts', // FF does not support uploading files (uploadFile) + + // FF does not support setting a file as mic input, no dominant speaker events + 'specs/3way/activeSpeaker.spec.ts', + 'specs/3way/startMuted.spec.ts', // bad audio levels + 'specs/4way/desktopSharing.spec.ts', + 'specs/4way/lastN.spec.ts', + + // when unmuting a participant, we see the presence in debug logs imidiately, + // but for 15 seconds it is not received/processed by the client + // (also the menu disappears after clicking one of the moderation options, does not happen manually) + 'specs/3way/audioVideoModeration.spec.ts' + ], capabilities: { p1: { capabilities: { @@ -47,30 +45,6 @@ const mergedConfig = merge(defaultConfig, { }, acceptInsecureCerts: process.env.ALLOW_INSECURE_CERTS === 'true' } - }, - p2: { - capabilities: { - 'wdio:exclude': [ - ...defaultConfig.capabilities.p2.capabilities['wdio:exclude'], - ...ffExcludes - ] - } - }, - p3: { - capabilities: { - 'wdio:exclude': [ - ...defaultConfig.capabilities.p3.capabilities['wdio:exclude'], - ...ffExcludes - ] - } - }, - p4: { - capabilities: { - 'wdio:exclude': [ - ...defaultConfig.capabilities.p4.capabilities['wdio:exclude'], - ...ffExcludes - ] - } } } }, { clone: false });