Skip to content

Commit 68d81eb

Browse files
committed
refactor: remove withConnectedUser from status tests
1 parent fc1f3fb commit 68d81eb

1 file changed

Lines changed: 11 additions & 16 deletions

File tree

apps/webapp/test/e2e_tests/specs/Status/status.spec.ts

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ import {Page} from 'playwright/test';
2121
import {ApiManagerE2E} from 'test/e2e_tests/backend/apiManager.e2e';
2222
import {User} from 'test/e2e_tests/data/user';
2323
import {PageManager} from 'test/e2e_tests/pageManager';
24-
import {test, expect, withConnectedUser, withLogin, Team} from 'test/e2e_tests/test.fixtures';
24+
import {test, expect, withLogin, Team} from 'test/e2e_tests/test.fixtures';
2525
import {getAudioFilePath, getTextFilePath, getVideoFilePath, shareAssetHelper} from 'test/e2e_tests/utils/asset.util';
2626
import {interceptNotifications} from 'test/e2e_tests/utils/mockNotifications.util';
2727
import {getImageFilePath} from 'test/e2e_tests/utils/sendImage.util';
28-
import {createGroup} from 'test/e2e_tests/utils/userActions';
28+
import {connectWithUser, createGroup} from 'test/e2e_tests/utils/userActions';
2929

3030
enum UserStatus {
3131
Away = 'Away',
@@ -224,10 +224,9 @@ test.describe('Status', () => {
224224

225225
for (const config of notificationConfigs) {
226226
test(config.title, {tag: config.tag}, async ({createPage, api}) => {
227-
const [userAPage, userBPage] = await Promise.all([
228-
createPage(withLogin(userA), withConnectedUser(userB)),
229-
createPage(withLogin(userB), withConnectedUser(userC)),
230-
]);
227+
const [userAPage, userBPage] = await Promise.all([createPage(withLogin(userA)), createPage(withLogin(userB))]);
228+
await connectWithUser(userAPage, userB);
229+
await connectWithUser(userBPage, userC);
231230

232231
const userAPageManager = PageManager.from(userAPage).webapp;
233232
const userBPageManager = PageManager.from(userBPage).webapp;
@@ -352,10 +351,8 @@ test.describe('Status', () => {
352351
'When I am available or have unset status, I want to get notifications for every message in non-muted conversations',
353352
{tag: ['@TC-3626', '@regression']},
354353
async ({createPage, api}) => {
355-
const [userAPage, userBPage] = await Promise.all([
356-
createPage(withLogin(userA), withConnectedUser(userB)),
357-
createPage(withLogin(userB)),
358-
]);
354+
const [userAPage, userBPage] = await Promise.all([createPage(withLogin(userA)), createPage(withLogin(userB))]);
355+
await connectWithUser(userAPage, userB);
359356

360357
const userAPageManager = PageManager.from(userAPage).webapp;
361358
const userBPageManager = PageManager.from(userBPage).webapp;
@@ -425,13 +422,11 @@ test.describe('Status', () => {
425422
);
426423

427424
test('I want to set my status on profile page', {tag: ['@TC-1766', '@regression']}, async ({createPage}) => {
428-
const [userAPageManager, userBPageManager] = await Promise.all([
429-
PageManager.from(createPage(withLogin(userA))),
430-
PageManager.from(createPage(withLogin(userB), withConnectedUser(userA))),
431-
]);
425+
const [userAPage, userBPage] = await Promise.all([createPage(withLogin(userA)), createPage(withLogin(userB))]);
426+
await connectWithUser(userAPage, userB);
432427

433-
const {pages, components, modals} = userAPageManager.webapp;
434-
const userBPages = userBPageManager.webapp.pages;
428+
const {pages, components, modals} = PageManager.from(userAPage).webapp;
429+
const userBPages = PageManager.from(userBPage).webapp.pages;
435430

436431
// User B verify no status is set in conversation list
437432
const conversation = await userBPages.conversationList().getConversation(userA.fullName, {protocol: 'mls'}).open();

0 commit comments

Comments
 (0)