Merge pull request #21183 from wireapp/mb/remove-withConnectedUser

test: remove page plugin "withConnectedUser" [WPB-25038]

Author: markbrockhoff

apps/webapp/test/e2e_tests/specs/Accessibility/Accessibility.spec.ts

@@ -19,9 +19,9 @@
 
 import {User} from 'test/e2e_tests/data/user';
 import {PageManager} from 'test/e2e_tests/pageManager';
-import {createGroup} from 'test/e2e_tests/utils/userActions';
+import {connectWithUser, createGroup} from 'test/e2e_tests/utils/userActions';
 
-import {expect, test, withConnectedUser, withLogin} from '../../test.fixtures';
+import {expect, test, withLogin} from '../../test.fixtures';
 
 test.describe('Accessibility', () => {
   let userA: User;
@@ -86,7 +86,10 @@ test.describe('Accessibility', () => {
       'I should not lose a drafted message when switching between conversations in collapsed view',
       {tag: ['@TC-51', '@regression']},
       async ({createPage}) => {
-        const pages = PageManager.from(await createPage(withLogin(userA), withConnectedUser(userB))).webapp.pages;
+        const page = await createPage(withLogin(userA));
+        await connectWithUser(page, userB);
+
+        const {pages} = PageManager.from(page).webapp;
 
         await createGroup(pages, 'Test Group', [userB]);
         await pages.conversation().messageInput.fill('Draft Message');

apps/webapp/test/e2e_tests/specs/AccountSettings/accountSettings.spec.ts

@@ -19,9 +19,9 @@
 
 import {getUser, User} from 'test/e2e_tests/data/user';
 import {PageManager} from 'test/e2e_tests/pageManager';
-import {loginUser, logOutUser} from 'test/e2e_tests/utils/userActions';
+import {connectWithUser, loginUser, logOutUser} from 'test/e2e_tests/utils/userActions';
 
-import {test, expect, LOGIN_TIMEOUT, withLogin, withConnectedUser} from '../../test.fixtures';
+import {test, expect, LOGIN_TIMEOUT, withLogin} from '../../test.fixtures';
 
 test.describe('account settings', () => {
   let owner: User;
@@ -181,9 +181,11 @@ test.describe('account settings', () => {
 
   test('Verify I can retrieve calling logs', {tag: ['@TC-1725', '@regression']}, async ({createPage}) => {
     const [memberAPage, memberBPage] = await Promise.all([
-      createPage(withLogin(memberA), withConnectedUser(memberB)),
+      createPage(withLogin(memberA)),
       createPage(withLogin(memberB)),
     ]);
+    await connectWithUser(memberAPage, memberB);
+
     const memberAPages = PageManager.from(memberAPage).webapp.pages;
     const memberBPages = PageManager.from(memberBPage).webapp.pages;
 

apps/webapp/test/e2e_tests/specs/Archive/archive.spec.ts

@@ -21,7 +21,7 @@ import {User} from 'test/e2e_tests/data/user';
 import {PageManager} from 'test/e2e_tests/pageManager';
 import {connectWithUser, createGroup} from 'test/e2e_tests/utils/userActions';
 
-import {expect, test, withConnectedUser, withLogin} from '../../test.fixtures';
+import {expect, test, withLogin} from '../../test.fixtures';
 import {Locator} from 'playwright/test';
 
 test.describe('Archive', () => {
@@ -37,7 +37,8 @@ test.describe('Archive', () => {
     'I want to archive and unarchive conversation via conversation list',
     {tag: ['@TC-97', '@regression']},
     async ({createPage}) => {
-      const page = await createPage(withLogin(memberA), withConnectedUser(memberB));
+      const page = await createPage(withLogin(memberA));
+      await connectWithUser(page, memberB);
       const {pages, components} = PageManager.from(page).webapp;
 
       const conversation = pages.conversationList().getConversation(memberB.fullName);
@@ -61,10 +62,13 @@ test.describe('Archive', () => {
     'Verify the conversation is not unarchived when there are new messages in this conversation',
     {tag: ['@TC-99', '@regression']},
     async ({createPage}) => {
-      const [memberAPages, memberBPages] = await Promise.all([
-        PageManager.from(createPage(withLogin(memberA), withConnectedUser(memberB))).then(pm => pm.webapp.pages),
-        PageManager.from(createPage(withLogin(memberB))).then(pm => pm.webapp.pages),
+      const [memberAPage, memberBPage] = await Promise.all([
+        createPage(withLogin(memberA)),
+        createPage(withLogin(memberB)),
       ]);
+      await connectWithUser(memberAPage, memberB);
+
+      const [memberAPages, memberBPages] = [memberAPage, memberBPage].map(page => PageManager.from(page).webapp.pages);
 
       const memberAConversation = await memberAPages
         .conversationList()
@@ -96,7 +100,8 @@ test.describe('Archive', () => {
     ] as const
   ).forEach(({title, tag}) => {
     test(title, {tag: [tag, '@regression']}, async ({createPage}) => {
-      const page = await createPage(withLogin(memberA), withConnectedUser(memberB));
+      const page = await createPage(withLogin(memberA));
+      await connectWithUser(page, memberB);
       const {pages, components} = PageManager.from(page).webapp;
 
       const conversation = await pages.conversationList().getConversation(memberB.fullName).open();

apps/webapp/test/e2e_tests/specs/Block/block.spec.ts

@@ -19,9 +19,9 @@
 
 import {User} from 'test/e2e_tests/data/user';
 import {PageManager} from 'test/e2e_tests/pageManager';
-import {test, expect, withLogin, withConnectedUser} from 'test/e2e_tests/test.fixtures';
+import {test, expect, withLogin} from 'test/e2e_tests/test.fixtures';
 
-import {createGroup, sendConnectionRequest} from '../../utils/userActions';
+import {connectWithUser, createGroup, sendConnectionRequest} from '../../utils/userActions';
 
 /* ========== Block Utils ========== */
 /**
@@ -245,8 +245,9 @@ test.describe('User Blocking', () => {
       'Verify you cannot add a person who blocked you to a group chat',
       {tag: ['@TC-143', '@regression']},
       async ({createPage}) => {
-        const userAPageManagerInstance = await PageManager.from(createPage(withLogin(userA), withConnectedUser(userC)));
+        const userAPageManagerInstance = await PageManager.from(createPage(withLogin(userA)));
         await sendConnectionRequest(userAPageManagerInstance, userB);
+        await connectWithUser(userAPageManagerInstance, userC);
         const {pages: userAPages, modals: userAModals} = userAPageManagerInstance.webapp;
 
         const conversationName = 'Group Conversation';
@@ -300,8 +301,9 @@ test.describe('User Blocking', () => {
       'Verify you can unblock someone from conversation list options',
       {tag: ['@TC-148', '@regression']},
       async ({createPage}) => {
-        const userAPageManagerInstance = await PageManager.from(createPage(withLogin(userA), withConnectedUser(userC)));
+        const userAPageManagerInstance = await PageManager.from(createPage(withLogin(userA)));
         await sendConnectionRequest(userAPageManagerInstance, userB);
+        await connectWithUser(userAPageManagerInstance, userC);
         const {pages: userAPages, modals: userAModals, components: userAComponents} = userAPageManagerInstance.webapp;
 
         // Preconditions: User B accepts the connection request
@@ -350,8 +352,9 @@ test.describe('User Blocking', () => {
     });
 
     test('Verify you can not block a user from your team', {tag: ['@TC-8778', '@regression']}, async ({createPage}) => {
-      const userAPageManager = (await PageManager.from(createPage(withLogin(userA), withConnectedUser(userB)))).webapp;
-      const userAPages = userAPageManager.pages;
+      const userAPageManager = await PageManager.from(createPage(withLogin(userA)));
+      await connectWithUser(userAPageManager, userB);
+      const userAPages = userAPageManager.webapp.pages;
 
       // Step 1: User A opens conversation with User B
       const conversation = await userAPages.conversationList().getConversation(userB.fullName).open();

apps/webapp/test/e2e_tests/specs/Calling/calling.spec.ts

@@ -21,9 +21,9 @@ import {Page} from 'playwright/test';
 import {AudioType} from 'Repositories/audio/audioType';
 import {User} from 'test/e2e_tests/data/user';
 import {PageManager} from 'test/e2e_tests/pageManager';
-import {test, withConnectedUser, withLogin, expect, Team, LOGIN_TIMEOUT} from 'test/e2e_tests/test.fixtures';
+import {test, withLogin, expect, Team, LOGIN_TIMEOUT} from 'test/e2e_tests/test.fixtures';
 import {isPlayingAudio} from 'test/e2e_tests/utils/audio.util';
-import {createGroup, sendConnectionRequest} from 'test/e2e_tests/utils/userActions';
+import {connectWithUser, createGroup, sendConnectionRequest} from 'test/e2e_tests/utils/userActions';
 
 async function joinCall(userPages: PageManager['webapp']['pages']) {
   await expect(userPages.calling().callCell).toBeVisible();
@@ -52,12 +52,12 @@ test.describe('Calling', () => {
     'Verify that current call is terminated if you want to call someone else (as caller)',
     {tag: ['@TC-2802', '@regression']},
     async ({createPage}) => {
-      const [{pages: userAPages, modals: userAModals}, {pages: userBPages}] = await Promise.all([
-        PageManager.from(createPage(withLogin(userA), withConnectedUser(userB), withConnectedUser(userC))).then(
-          pm => pm.webapp,
-        ),
-        PageManager.from(createPage(withLogin(userB))).then(pm => pm.webapp),
-      ]);
+      const [userAPage, userBPage] = await Promise.all([createPage(withLogin(userA)), createPage(withLogin(userB))]);
+      await connectWithUser(userAPage, userB);
+      await connectWithUser(userAPage, userC);
+
+      const {pages: userAPages, modals: userAModals} = PageManager.from(userAPage).webapp;
+      const {pages: userBPages} = PageManager.from(userBPage).webapp;
 
       // User A has a call with user B
       await userAPages.conversationList().getConversation(userB.fullName).open();
@@ -79,10 +79,7 @@ test.describe('Calling', () => {
   );
 
   test('Verify Raise hand functionality', {tag: ['@TC-8773', '@regression']}, async ({createPage}) => {
-    const [userAPage, userBPage] = await Promise.all([
-      createPage(withLogin(userA), withConnectedUser(userB)),
-      createPage(withLogin(userB)),
-    ]);
+    const [userAPage, userBPage] = await Promise.all([createPage(withLogin(userA)), createPage(withLogin(userB))]);
 
     const userAPages = PageManager.from(userAPage).webapp.pages;
     const userBPages = PageManager.from(userBPage).webapp.pages;
@@ -113,10 +110,11 @@ test.describe('Calling', () => {
   });
 
   test('Verify in call reactions', {tag: ['@TC-8774', '@regression']}, async ({createPage}) => {
-    const [userAPages, userBPages] = await Promise.all([
-      PageManager.from(createPage(withLogin(userA), withConnectedUser(userB))).then(pm => pm.webapp.pages),
-      PageManager.from(createPage(withLogin(userB))).then(pm => pm.webapp.pages),
-    ]);
+    const [userAPage, userBPage] = await Promise.all([createPage(withLogin(userA)), createPage(withLogin(userB))]);
+    await connectWithUser(userAPage, userB);
+
+    const userAPages = PageManager.from(userAPage).webapp.pages;
+    const userBPages = PageManager.from(userBPage).webapp.pages;
 
     await userAPages.conversationList().getConversation(userB.fullName).open();
     await userAPages.conversation().clickCallButton();
@@ -136,10 +134,11 @@ test.describe('Calling', () => {
     'I want to answer incoming call with Join button in conversation view',
     {tag: ['@TC-2826', '@regression']},
     async ({createPage}) => {
-      const [userAPages, userBPages] = await Promise.all([
-        PageManager.from(createPage(withLogin(userA), withConnectedUser(userB))).then(pm => pm.webapp.pages),
-        PageManager.from(createPage(withLogin(userB))).then(pm => pm.webapp.pages),
-      ]);
+      const [userAPage, userBPage] = await Promise.all([createPage(withLogin(userA)), createPage(withLogin(userB))]);
+      await connectWithUser(userAPage, userB);
+
+      const userAPages = PageManager.from(userAPage).webapp.pages;
+      const userBPages = PageManager.from(userBPage).webapp.pages;
 
       await userAPages.conversationList().getConversation(userB.fullName, {protocol: 'mls'}).open();
       await userAPages.conversation().clickCallButton();
@@ -166,10 +165,9 @@ test.describe('Calling', () => {
     },
   ].forEach(({description, tag, conversationType}) => {
     test(description, {tag: [tag, '@regression']}, async ({createPage}) => {
-      const [userAPage, userBPage1] = await Promise.all([
-        createPage(withLogin(userA), withConnectedUser(userB)),
-        createPage(withLogin(userB)),
-      ]);
+      const [userAPage, userBPage1] = await Promise.all([createPage(withLogin(userA)), createPage(withLogin(userB))]);
+      await connectWithUser(userAPage, userB);
+
       const userAPages = PageManager.from(userAPage).webapp.pages;
       const userBDevice1Pages = PageManager.from(userBPage1).webapp.pages;
 
@@ -209,10 +207,12 @@ test.describe('Calling', () => {
     'Verify I can make another call while current one is ignored',
     {tag: ['@TC-2803', '@regression']},
     async ({createPage}) => {
-      const [userAPages, userBPages] = await Promise.all([
-        PageManager.from(createPage(withLogin(userA), withConnectedUser(userB))).then(pm => pm.webapp.pages),
-        PageManager.from(createPage(withLogin(userB), withConnectedUser(userC))).then(pm => pm.webapp.pages),
-      ]);
+      const [userAPage, userBPage] = await Promise.all([createPage(withLogin(userA)), createPage(withLogin(userB))]);
+      await connectWithUser(userAPage, userB);
+      await connectWithUser(userBPage, userC);
+
+      const userAPages = PageManager.from(userAPage).webapp.pages;
+      const userBPages = PageManager.from(userBPage).webapp.pages;
 
       // User A calls user B
       await userAPages.conversationList().getConversation(userB.fullName).open();
@@ -243,8 +243,8 @@ test.describe('Calling', () => {
   ].forEach(({description, tag, verifyScreenShare}) => {
     test(description, {tag: [tag, '@regression']}, async ({createPage}) => {
       const [userAPages, userBPages, userCPage] = await Promise.all([
-        PageManager.from(createPage(withLogin(userA), withConnectedUser(userB))).then(pm => pm.webapp.pages),
-        PageManager.from(createPage(withLogin(userB), withConnectedUser(userC))).then(pm => pm.webapp.pages),
+        PageManager.from(createPage(withLogin(userA))).then(pm => pm.webapp.pages),
+        PageManager.from(createPage(withLogin(userB))).then(pm => pm.webapp.pages),
         createPage(withLogin(userC)),
       ]);
 
@@ -277,7 +277,7 @@ test.describe('Calling', () => {
 
   test('Verify Call UI checks', {tag: ['@TC-8771', '@regression']}, async ({createPage}) => {
     const [userAPages, userBPages] = await Promise.all([
-      PageManager.from(createPage(withLogin(userA), withConnectedUser(userB))).then(pm => pm.webapp.pages),
+      PageManager.from(createPage(withLogin(userA))).then(pm => pm.webapp.pages),
       PageManager.from(createPage(withLogin(userB))).then(pm => pm.webapp.pages),
     ]);
 
@@ -347,9 +347,10 @@ test.describe('Calling', () => {
     'Verify joining and leaving call from second client does not disconnect the first client',
     {tag: ['@TC-2827', '@regression']},
     async ({createPage}) => {
-      const [userAPage, userBPage] = await Promise.all([createPage(withLogin(userA)), createPage(withLogin(userB))]);
-      const userAPages = PageManager.from(userAPage).webapp.pages;
-      const userBPages = PageManager.from(userBPage).webapp.pages;
+      const [userAPages, userBPages] = await Promise.all([
+        PageManager.from(createPage(withLogin(userA))).then(pm => pm.webapp.pages),
+        PageManager.from(createPage(withLogin(userB))).then(pm => pm.webapp.pages),
+      ]);
 
       // Log in a second session/device for User A.
       const userAPage2 = await createPage(withLogin(userA, {confirmNewHistory: true}));
@@ -397,7 +398,7 @@ test.describe('Calling', () => {
     {tag: ['@TC-2837', '@regression']},
     async ({createPage}) => {
       const [userAPages, userBPages, userCPages] = await Promise.all([
-        PageManager.from(createPage(withLogin(userA), withConnectedUser(userB))).then(pm => pm.webapp.pages),
+        PageManager.from(createPage(withLogin(userA))).then(pm => pm.webapp.pages),
         PageManager.from(createPage(withLogin(userB))).then(pm => pm.webapp.pages),
         PageManager.from(createPage(withLogin(userC))).then(pm => pm.webapp.pages),
       ]);
@@ -432,7 +433,7 @@ test.describe('Calling', () => {
     {tag: ['@TC-2838', '@regression']},
     async ({createPage}) => {
       const [userAPages, userBPages] = await Promise.all([
-        PageManager.from(createPage(withLogin(userA), withConnectedUser(userB))).then(pm => pm.webapp.pages),
+        PageManager.from(createPage(withLogin(userA))).then(pm => pm.webapp.pages),
         PageManager.from(createPage(withLogin(userB))).then(pm => pm.webapp.pages),
       ]);
 
@@ -471,9 +472,9 @@ test.describe('Calling', () => {
       }
 
       const allMembers = [userB, userC, ...extraMembers];
-      const {pages: userAPages, modals: userAModals} = PageManager.from(
-        await createPage(withLogin(userA), withConnectedUser(userB)),
-      ).webapp;
+      const userAPage = await createPage(withLogin(userA));
+
+      const {pages: userAPages, modals: userAModals} = PageManager.from(userAPage).webapp;
 
       await createGroup(userAPages, groupName, allMembers);
       await userAPages.conversationList().getConversation(groupName).open();
@@ -491,11 +492,12 @@ test.describe('Calling', () => {
     async ({createPage, createUser}) => {
       const guestUser = await createUser();
       const [userAPage, userBPage, guestPage] = await Promise.all([
-        PageManager.from(createPage(withLogin(userA), withConnectedUser(userB))),
+        PageManager.from(createPage(withLogin(userA))),
         PageManager.from(createPage(withLogin(userB))),
         PageManager.from(createPage(withLogin(guestUser))),
       ]);
       await sendConnectionRequest(userAPage, guestUser);
+      await connectWithUser(userAPage, userB);
 
       const [userAPages, userBPages, guestPages] = [userAPage, userBPage, guestPage].map(pm => pm.webapp.pages);
 
@@ -769,10 +771,7 @@ test.describe('Calling', () => {
     },
   ].forEach(({description, tag, verify}) => {
     test(description, {tag: [tag, '@regression']}, async ({createPage}) => {
-      const [userAPage, userBPage] = await Promise.all([
-        createPage(withLogin(userA), withConnectedUser(userB)),
-        createPage(withLogin(userB)),
-      ]);
+      const [userAPage, userBPage] = await Promise.all([createPage(withLogin(userA)), createPage(withLogin(userB))]);
 
       const userAPages = PageManager.from(userAPage).webapp.pages;
       const userBPages = PageManager.from(userBPage).webapp.pages;
@@ -887,7 +886,7 @@ test.describe('Calling', () => {
 
   test('I want to see multiple active speakers in 1 call', {tag: ['@TC-2945', '@regression']}, async ({createPage}) => {
     const [userAPages, userBPages, userCPages] = await Promise.all([
-      PageManager.from(createPage(withLogin(userA), withConnectedUser(userB))).then(pm => pm.webapp.pages),
+      PageManager.from(createPage(withLogin(userA))).then(pm => pm.webapp.pages),
       PageManager.from(createPage(withLogin(userB))).then(pm => pm.webapp.pages),
       PageManager.from(createPage(withLogin(userC))).then(pm => pm.webapp.pages),
     ]);
@@ -925,10 +924,8 @@ test.describe('Calling', () => {
     {id: '@TC-2909', title: 'I want to have 1:1 CBR audio call when the receiver turned it on'} as const,
   ].forEach(({id, title}) => {
     test(title, {tag: [id, '@regression']}, async ({createPage}) => {
-      const [userAPage, userBPage] = await Promise.all([
-        createPage(withLogin(userA)),
-        createPage(withLogin(userB), withConnectedUser(userA)),
-      ]);
+      const [userAPage, userBPage] = await Promise.all([createPage(withLogin(userA)), createPage(withLogin(userB))]);
+      await connectWithUser(userAPage, userB);
 
       const {pages: userAPages} = PageManager.from(userAPage).webapp;
       const {pages: userBPages} = PageManager.from(userBPage).webapp;