fix: Use the iframe configured tenant for iframe tests.

tests/helpers/participants.ts

@@ -216,6 +216,10 @@ async function joinParticipant( // eslint-disable-line max-params
         tenant = config.iframe.tenant;
     }
 
+    if (!tenant && ctx.testProperties.useIFrameApi) {
+        tenant = config.iframe.tenant;
+    }
+
     return await newParticipant.joinConference({
         ...options,
         tenant: tenant,

tests/specs/iframe/visitorsLive.spec.ts

@@ -1,81 +0,0 @@
-import { expect } from '@wdio/globals';
-
-import { setTestProperties } from '../../helpers/TestProperties';
-import { ensureOneParticipant, ensureTwoParticipants } from '../../helpers/participants';
-
-setTestProperties(__filename, {
-    useIFrameApi: true,
-    useWebhookProxy: true,
-    usesBrowsers: [ 'p1', 'p2' ]
-});
-
-describe('Visitors', () => {
-    it('joining the meeting', async () => {
-        const { webhooksProxy } = ctx;
-
-        if (webhooksProxy) {
-            webhooksProxy.defaultMeetingSettings = {
-                visitorsEnabled: true,
-                visitorsLive: false
-            };
-        }
-
-        await ensureOneParticipant();
-
-        const { p1 } = ctx;
-
-        if (await p1.execute(() => config.disableIframeAPI)) {
-            // skip the test if iframeAPI is disabled or visitors are not supported
-            ctx.skipSuiteTests = true;
-
-            return;
-        }
-
-        await p1.driver.waitUntil(() => p1.execute(() => APP.conference._room.isVisitorsSupported()), {
-            timeout: 2000
-        }).then(async () => {
-            await p1.switchToMainFrame();
-        }).catch(() => {
-            ctx.skipSuiteTests = true;
-        });
-    });
-
-
-    it('go live', async () => {
-        await ensureTwoParticipants({
-            preferGenerateToken: true,
-            tokenOptions: { visitor: true },
-            skipWaitToJoin: true,
-            skipInMeetingChecks: true
-        });
-
-        const { p1, p2 } = ctx;
-        const p2Visitors = p2.getVisitors();
-        const p1Visitors = p1.getVisitors();
-
-        await p2.driver.waitUntil(async () => p2Visitors.isVisitorsQueueUIShown(), {
-            timeout: 5000,
-            timeoutMsg: 'Missing visitors queue UI'
-        });
-
-        await p1.driver.waitUntil(async () => await p1Visitors.getWaitingVisitorsInQueue()
-                === 'Viewers waiting in queue: 1', {
-            timeout: 15000,
-            timeoutMsg: 'Missing visitors queue count in UI'
-        });
-
-        await p1Visitors.goLive();
-
-        await p2.waitToJoinMUC();
-        await p2.waitForReceiveMedia(15000, 'Visitor is not receiving media');
-        await p2.waitForRemoteStreams(1);
-
-        await p2.driver.waitUntil(() => p2Visitors.hasVisitorsDialog(), {
-            timeout: 5000,
-            timeoutMsg: 'Missing visitors dialog'
-        });
-
-        expect((await p1Visitors.getVisitorsCount()).trim()).toBe('1');
-        expect((await p1Visitors.getVisitorsHeaderFromParticipantsPane()).trim()).toBe('Viewers 1');
-    });
-});

tests/specs/jaas/visitors/visitorsLive.spec.ts

@@ -0,0 +1,74 @@
+import { expect } from '@wdio/globals';
+
+import { Participant } from '../../../helpers/Participant';
+import { setTestProperties } from '../../../helpers/TestProperties';
+import { joinMuc, generateJaasToken as t } from '../../helpers/jaas';
+
+setTestProperties(__filename, {
+    useJaas: true,
+    useWebhookProxy: true,
+    usesBrowsers: [ 'p1', 'p2' ]
+});
+
+describe('Visitors', () => {
+    let visitor: Participant, moderator: Participant;
+
+    it('setup', async () => {
+        ctx.webhooksProxy.defaultMeetingSettings = {
+            visitorsEnabled: true,
+            visitorsLive: false
+        };
+
+        moderator = await joinMuc({
+            name: 'p1',
+            token: t({ room: ctx.roomName, displayName: 'Mo de Rator', moderator: true })
+        });
+
+        // TODO: Remove this in favor of configurable test expectations
+        await moderator.driver.waitUntil(() => moderator.execute(() => APP.conference._room.isVisitorsSupported()), {
+            timeout: 2000
+        }).catch(e => {
+            console.log(`Skipping test due to error: ${e}`);
+            ctx.skipSuiteTests = true;
+        });
+
+        visitor = await joinMuc({
+            name: 'p2',
+            token: t({ room: ctx.roomName, displayName: 'Visi Tor', visitor: true })
+        }, {
+            skipWaitToJoin: true
+        });
+    });
+
+
+    it('go live', async () => {
+
+        const vVisitors = visitor.getVisitors();
+        const mVisitors = moderator.getVisitors();
+
+        await visitor.driver.waitUntil(async () => vVisitors.isVisitorsQueueUIShown(), {
+            timeout: 5000,
+            timeoutMsg: 'Missing visitors queue UI'
+        });
+
+        await moderator.driver.waitUntil(async () => await mVisitors.getWaitingVisitorsInQueue()
+                === 'Viewers waiting in queue: 1', {
+            timeout: 15000,
+            timeoutMsg: 'Missing visitors queue count in UI'
+        });
+
+        await mVisitors.goLive();
+
+        await visitor.waitToJoinMUC();
+        await visitor.waitForReceiveMedia(15000, 'Visitor is not receiving media');
+        await visitor.waitForRemoteStreams(1);
+
+        await visitor.driver.waitUntil(() => vVisitors.hasVisitorsDialog(), {
+            timeout: 5000,
+            timeoutMsg: 'Missing visitors dialog'
+        });
+
+        expect((await mVisitors.getVisitorsCount()).trim()).toBe('1');
+        expect((await mVisitors.getVisitorsHeaderFromParticipantsPane()).trim()).toBe('Viewers 1');
+    });
+});

tests/wdio.conf.ts

@@ -245,8 +245,17 @@ export const config: WebdriverIO.MultiremoteConfig = {
         // If we are running the iFrameApi tests, we need to mark it as such and if needed to create the proxy
         // and connect to it.
         if (testProperties.useWebhookProxy && testsConfig.webhooksProxy.enabled && !globalAny.ctx.webhooksProxy) {
-            // Note this prevents iframe and jaas test from running together.
-            const tenant = testsConfig.jaas.enabled ? testsConfig.jaas.tenant : testsConfig.iframe.tenant;
+            let tenant = testsConfig.jaas.tenant;
+
+            if (!testProperties.useJaas) {
+                tenant = testsConfig.iframe.tenant;
+            }
+            if (!tenant) {
+                console.log(`Can not configure WebhookProxy, missing tenant in config. Skipping ${testName}.`);
+                globalAny.ctx.skipSuiteTests = true;
+
+                return;
+            }
 
             globalAny.ctx.webhooksProxy = new WebhookProxy(
                 `${testsConfig.webhooksProxy.url}?tenant=${tenant}&room=${globalAny.ctx.roomName}`,