From cd4ede50849e44ae7e8ec2c661d93baa491f8804 Mon Sep 17 00:00:00 2001 From: gabriellsh Date: Thu, 16 Mar 2023 11:08:46 -0300 Subject: [PATCH] Fix attempt 2 --- apps/meteor/tests/e2e/e2e-encryption.spec.ts | 8 +- .../e2e/federation/tests/messaging/dm.spec.ts | 102 ++++++++-------- .../tests/messaging/private.spec.ts | 110 +++++++++--------- .../federation/tests/messaging/public.spec.ts | 110 +++++++++--------- apps/meteor/tests/e2e/messaging.spec.ts | 8 +- 5 files changed, 169 insertions(+), 169 deletions(-) diff --git a/apps/meteor/tests/e2e/e2e-encryption.spec.ts b/apps/meteor/tests/e2e/e2e-encryption.spec.ts index 914d03cf31aa4..78596472d2170 100644 --- a/apps/meteor/tests/e2e/e2e-encryption.spec.ts +++ b/apps/meteor/tests/e2e/e2e-encryption.spec.ts @@ -161,7 +161,7 @@ test.describe.serial('e2e-encryption', () => { await poHomeChannel.content.sendMessage('hello world'); - await expect(poHomeChannel.content.lastUserMessage.locator('div')).toHaveText('hello world'); + await expect(poHomeChannel.content.lastUserMessage).toHaveText('hello world'); await expect(poHomeChannel.content.lastUserMessage.locator('.rcx-icon--name-key')).toBeVisible(); await poHomeChannel.tabs.kebab.click({ force: true }); @@ -171,7 +171,7 @@ test.describe.serial('e2e-encryption', () => { await poHomeChannel.content.sendMessage('hello world not encrypted'); - await expect(poHomeChannel.content.lastUserMessage.locator('div')).toHaveText('hello world not encrypted'); + await expect(poHomeChannel.content.lastUserMessage).toHaveText('hello world not encrypted'); await expect(poHomeChannel.content.lastUserMessage.locator('.rcx-icon--name-key')).not.toBeVisible(); await poHomeChannel.tabs.kebab.click({ force: true }); @@ -181,7 +181,7 @@ test.describe.serial('e2e-encryption', () => { await poHomeChannel.content.sendMessage('hello world encrypted again'); - await expect(poHomeChannel.content.lastUserMessage.locator('div')).toHaveText('hello world encrypted again'); + await expect(poHomeChannel.content.lastUserMessage).toHaveText('hello world encrypted again'); await expect(poHomeChannel.content.lastUserMessage.locator('.rcx-icon--name-key')).toBeVisible(); }); @@ -207,7 +207,7 @@ test.describe.serial('e2e-encryption', () => { await poHomeChannel.content.sendMessage('hello world'); - await expect(poHomeChannel.content.lastUserMessage.locator('div')).toHaveText('hello world'); + await expect(poHomeChannel.content.lastUserMessage).toHaveText('hello world'); await expect(poHomeChannel.content.lastUserMessage.locator('.rcx-icon--name-key')).toBeVisible(); }); }); diff --git a/apps/meteor/tests/e2e/federation/tests/messaging/dm.spec.ts b/apps/meteor/tests/e2e/federation/tests/messaging/dm.spec.ts index f4d9bb3260671..65c5466a9d567 100644 --- a/apps/meteor/tests/e2e/federation/tests/messaging/dm.spec.ts +++ b/apps/meteor/tests/e2e/federation/tests/messaging/dm.spec.ts @@ -95,8 +95,8 @@ test.describe.parallel('Federation - DM Messaging', () => { await poFederationChannelServer2.sidenav.openChat(adminUsernameWithDomainFromServer1); await poFederationChannelServer1.content.sendMessage('hello world from server A'); - await expect(poFederationChannelServer1.content.lastUserMessage.locator('div')).toHaveText('hello world from server A'); - await expect(poFederationChannelServer2.content.lastUserMessage.locator('div')).toHaveText('hello world from server A'); + await expect(poFederationChannelServer1.content.lastUserMessage).toHaveText('hello world from server A'); + await expect(poFederationChannelServer2.content.lastUserMessage).toHaveText('hello world from server A'); }); test('expect to send a message from Server B to Server A', async ({ page }) => { @@ -107,8 +107,8 @@ test.describe.parallel('Federation - DM Messaging', () => { await poFederationChannelServer2.sidenav.openChat(adminUsernameWithDomainFromServer1); await poFederationChannelServer2.content.sendMessage('hello world from server B'); - await expect(poFederationChannelServer1.content.lastUserMessage.locator('div')).toHaveText('hello world from server B'); - await expect(poFederationChannelServer2.content.lastUserMessage.locator('div')).toHaveText('hello world from server B'); + await expect(poFederationChannelServer1.content.lastUserMessage).toHaveText('hello world from server B'); + await expect(poFederationChannelServer2.content.lastUserMessage).toHaveText('hello world from server B'); }); test.describe('With multiple users', () => { @@ -157,9 +157,9 @@ test.describe.parallel('Federation - DM Messaging', () => { await poFederationChannelServer2.sidenav.openDMMultipleChat(adminUsernameWithDomainFromServer1); - await expect(poFederationChannelServer1.content.lastUserMessage.locator('div')).toHaveText('hello world from server A (creator)'); - await expect(poFederationChannel1ForUser2.content.lastUserMessage.locator('div')).toHaveText('hello world from server A (creator)'); - await expect(poFederationChannelServer2.content.lastUserMessage.locator('div')).toHaveText('hello world from server A (creator)'); + await expect(poFederationChannelServer1.content.lastUserMessage).toHaveText('hello world from server A (creator)'); + await expect(poFederationChannel1ForUser2.content.lastUserMessage).toHaveText('hello world from server A (creator)'); + await expect(poFederationChannelServer2.content.lastUserMessage).toHaveText('hello world from server A (creator)'); await pageForServer2.close(); await page2.close(); }); @@ -199,13 +199,13 @@ test.describe.parallel('Federation - DM Messaging', () => { await poFederationChannel1ForUser2.content.sendMessage('hello world from server A (user 2)'); await poFederationChannel1ForUser2.content.sendMessage('hello world from server A (user 2) message 2'); - await expect(poFederationChannelServer2.content.lastUserMessage.locator('div')).toHaveText( + await expect(poFederationChannelServer2.content.lastUserMessage).toHaveText( 'hello world from server A (user 2) message 2', ); - await expect(poFederationChannel1ForUser2.content.lastUserMessage.locator('div')).toHaveText( + await expect(poFederationChannel1ForUser2.content.lastUserMessage).toHaveText( 'hello world from server A (user 2) message 2', ); - await expect(poFederationChannelServer1.content.lastUserMessage.locator('div')).toHaveText( + await expect(poFederationChannelServer1.content.lastUserMessage).toHaveText( 'hello world from server A (user 2) message 2', ); @@ -246,9 +246,9 @@ test.describe.parallel('Federation - DM Messaging', () => { await poFederationChannelServer2.content.sendMessage('hello world from server B'); - await expect(poFederationChannelServer2.content.lastUserMessage.locator('div')).toHaveText('hello world from server B'); - await expect(poFederationChannelServer1.content.lastUserMessage.locator('div')).toHaveText('hello world from server B'); - await expect(poFederationChannel1ForUser2.content.lastUserMessage.locator('div')).toHaveText('hello world from server B'); + await expect(poFederationChannelServer2.content.lastUserMessage).toHaveText('hello world from server B'); + await expect(poFederationChannelServer1.content.lastUserMessage).toHaveText('hello world from server B'); + await expect(poFederationChannel1ForUser2.content.lastUserMessage).toHaveText('hello world from server B'); await pageForServer2.close(); await page2.close(); }); @@ -265,10 +265,10 @@ test.describe.parallel('Federation - DM Messaging', () => { await poFederationChannelServer1.content.sendMessage('😀 😀 hello world 🌎 from server A with emojis 😀 😀'); - await expect(poFederationChannelServer1.content.lastUserMessage.locator('div')).toHaveText( + await expect(poFederationChannelServer1.content.lastUserMessage).toHaveText( '😀 😀 hello world 🌎 from server A with emojis 😀 😀', ); - await expect(poFederationChannelServer2.content.lastUserMessage.locator('div')).toHaveText( + await expect(poFederationChannelServer2.content.lastUserMessage).toHaveText( '😀 😀 hello world 🌎 from server A with emojis 😀 😀', ); }); @@ -282,10 +282,10 @@ test.describe.parallel('Federation - DM Messaging', () => { await poFederationChannelServer2.content.sendMessage('😀 😀 hello world 🌎 from server B with emojis 😀 😀'); - await expect(poFederationChannelServer1.content.lastUserMessage.locator('div')).toHaveText( + await expect(poFederationChannelServer1.content.lastUserMessage).toHaveText( '😀 😀 hello world 🌎 from server B with emojis 😀 😀', ); - await expect(poFederationChannelServer2.content.lastUserMessage.locator('div')).toHaveText( + await expect(poFederationChannelServer2.content.lastUserMessage).toHaveText( '😀 😀 hello world 🌎 from server B with emojis 😀 😀', ); }); @@ -494,10 +494,10 @@ test.describe.parallel('Federation - DM Messaging', () => { `hello @${usernameWithDomainFromServer2}, here's @${constants.RC_SERVER_1.username} from Server A`, ); - await expect(poFederationChannelServer1.content.lastUserMessage.locator('div')).toHaveText( + await expect(poFederationChannelServer1.content.lastUserMessage).toHaveText( `hello ${usernameWithDomainFromServer2}, here's ${constants.RC_SERVER_1.username} from Server A`, ); - await expect(poFederationChannelServer2.content.lastUserMessage.locator('div')).toHaveText( + await expect(poFederationChannelServer2.content.lastUserMessage).toHaveText( `hello ${userFromServer2UsernameOnly}, here's ${adminUsernameWithDomainFromServer1} from Server A`, ); }); @@ -525,10 +525,10 @@ test.describe.parallel('Federation - DM Messaging', () => { `hello @${adminUsernameWithDomainFromServer1}, here's @${userFromServer2UsernameOnly} from Server B`, ); - await expect(poFederationChannelServer1.content.lastUserMessage.locator('div')).toHaveText( + await expect(poFederationChannelServer1.content.lastUserMessage).toHaveText( `hello ${constants.RC_SERVER_1.username}, here's ${usernameWithDomainFromServer2} from Server B`, ); - await expect(poFederationChannelServer2.content.lastUserMessage.locator('div')).toHaveText( + await expect(poFederationChannelServer2.content.lastUserMessage).toHaveText( `hello ${adminUsernameWithDomainFromServer1}, here's ${userFromServer2UsernameOnly} from Server B`, ); }); @@ -543,10 +543,10 @@ test.describe.parallel('Federation - DM Messaging', () => { `hello @${usernameWithDomainFromServer2}, here's @${constants.RC_SERVER_1.username} from Server A, @all, @${usernameWithDomainFromServer2}`, ); - await expect(poFederationChannelServer1.content.lastUserMessage.locator('div')).toHaveText( + await expect(poFederationChannelServer1.content.lastUserMessage).toHaveText( `hello ${usernameWithDomainFromServer2}, here's ${constants.RC_SERVER_1.username} from Server A, all, ${usernameWithDomainFromServer2}`, ); - await expect(poFederationChannelServer2.content.lastUserMessage.locator('div')).toHaveText( + await expect(poFederationChannelServer2.content.lastUserMessage).toHaveText( `hello ${userFromServer2UsernameOnly}, here's ${adminUsernameWithDomainFromServer1} from Server A, all, ${userFromServer2UsernameOnly}`, ); }); @@ -914,13 +914,13 @@ test.describe.parallel('Federation - DM Messaging', () => { await poFederationChannelServer1.content.sendMessageUsingEnter('message from Server A'); - await expect(poFederationChannelServer1.content.lastUserMessage.locator('div')).toHaveText('message from Server A'); - await expect(poFederationChannelServerUser2.content.lastUserMessage.locator('div')).toHaveText('message from Server A'); + await expect(poFederationChannelServer1.content.lastUserMessage).toHaveText('message from Server A'); + await expect(poFederationChannelServerUser2.content.lastUserMessage).toHaveText('message from Server A'); await poFederationChannelServer1.content.editLastMessage('message from Server A - Edited'); - await expect(poFederationChannelServer1.content.lastUserMessage.locator('div')).toHaveText('message from Server A - Edited'); - await expect(poFederationChannelServerUser2.content.lastUserMessage.locator('div')).toHaveText('message from Server A - Edited'); + await expect(poFederationChannelServer1.content.lastUserMessage).toHaveText('message from Server A - Edited'); + await expect(poFederationChannelServerUser2.content.lastUserMessage).toHaveText('message from Server A - Edited'); await page2.close(); }); @@ -954,13 +954,13 @@ test.describe.parallel('Federation - DM Messaging', () => { await poFederationChannelServerUser2.content.sendMessageUsingEnter('message from Server B'); - await expect(poFederationChannelServerUser2.content.lastUserMessage.locator('div')).toHaveText('message from Server B'); - await expect(poFederationChannelServer1.content.lastUserMessage.locator('div')).toHaveText('message from Server B'); + await expect(poFederationChannelServerUser2.content.lastUserMessage).toHaveText('message from Server B'); + await expect(poFederationChannelServer1.content.lastUserMessage).toHaveText('message from Server B'); await poFederationChannelServerUser2.content.editLastMessage('message from Server B - Edited'); - await expect(poFederationChannelServerUser2.content.lastUserMessage.locator('div')).toHaveText('message from Server B - Edited'); - await expect(poFederationChannelServer1.content.lastUserMessage.locator('div')).toHaveText('message from Server B - Edited'); + await expect(poFederationChannelServerUser2.content.lastUserMessage).toHaveText('message from Server B - Edited'); + await expect(poFederationChannelServer1.content.lastUserMessage).toHaveText('message from Server B - Edited'); await page2.close(); }); @@ -992,8 +992,8 @@ test.describe.parallel('Federation - DM Messaging', () => { await poFederationChannelServer1.content.sendMessageUsingEnter('message from Server A'); await poFederationChannelServerUser2.sidenav.openChat(adminUsernameWithDomainFromServer1); - await expect(poFederationChannelServer1.content.lastUserMessage.locator('div')).toHaveText('message from Server A'); - await expect(poFederationChannelServerUser2.content.lastUserMessage.locator('div')).toHaveText('message from Server A'); + await expect(poFederationChannelServer1.content.lastUserMessage).toHaveText('message from Server A'); + await expect(poFederationChannelServerUser2.content.lastUserMessage).toHaveText('message from Server A'); await poFederationChannelServer1.content.deleteLastMessage(); await expect(poFederationChannelServer1.toastSuccess).toBeVisible(); @@ -1031,8 +1031,8 @@ test.describe.parallel('Federation - DM Messaging', () => { await poFederationChannelServer1.content.sendMessageUsingEnter('message from Server A'); await poFederationChannelServerUser2.sidenav.openChat(adminUsernameWithDomainFromServer1); - await expect(poFederationChannelServer1.content.lastUserMessage.locator('div')).toHaveText('message from Server A'); - await expect(poFederationChannelServerUser2.content.lastUserMessage.locator('div')).toHaveText('message from Server A'); + await expect(poFederationChannelServer1.content.lastUserMessage).toHaveText('message from Server A'); + await expect(poFederationChannelServerUser2.content.lastUserMessage).toHaveText('message from Server A'); await poFederationChannelServer1.content.deleteLastMessage(); await page.waitForTimeout(2000); @@ -1075,8 +1075,8 @@ test.describe.parallel('Federation - DM Messaging', () => { await poFederationChannelServer1.content.sendMessageUsingEnter('message from Server A'); - await expect(poFederationChannelServer1.content.lastUserMessage.locator('div')).toHaveText('message from Server A'); - await expect(poFederationChannelServerUser2.content.lastUserMessage.locator('div')).toHaveText('message from Server A'); + await expect(poFederationChannelServer1.content.lastUserMessage).toHaveText('message from Server A'); + await expect(poFederationChannelServerUser2.content.lastUserMessage).toHaveText('message from Server A'); await poFederationChannelServer1.content.starLastMessage(); await expect( @@ -1117,8 +1117,8 @@ test.describe.parallel('Federation - DM Messaging', () => { await poFederationChannelServerUser2.content.sendMessageUsingEnter('message from Server A'); - await expect(poFederationChannelServer1.content.lastUserMessage.locator('div')).toHaveText('message from Server A'); - await expect(poFederationChannelServerUser2.content.lastUserMessage.locator('div')).toHaveText('message from Server A'); + await expect(poFederationChannelServer1.content.lastUserMessage).toHaveText('message from Server A'); + await expect(poFederationChannelServerUser2.content.lastUserMessage).toHaveText('message from Server A'); await poFederationChannelServerUser2.content.starLastMessage(); await expect( @@ -1159,8 +1159,8 @@ test.describe.parallel('Federation - DM Messaging', () => { await poFederationChannelServer1.content.sendMessageUsingEnter('message from Server A'); - await expect(poFederationChannelServer1.content.lastUserMessage.locator('div')).toHaveText('message from Server A'); - await expect(poFederationChannelServerUser2.content.lastUserMessage.locator('div')).toHaveText('message from Server A'); + await expect(poFederationChannelServer1.content.lastUserMessage).toHaveText('message from Server A'); + await expect(poFederationChannelServerUser2.content.lastUserMessage).toHaveText('message from Server A'); await poFederationChannelServer1.content.openLastMessageMenu(); await expect(poFederationChannelServer1.content.btnOptionReplyInThread).not.toBeVisible(); @@ -1197,8 +1197,8 @@ test.describe.parallel('Federation - DM Messaging', () => { await poFederationChannelServerUser2.content.sendMessageUsingEnter('message from Server A'); - await expect(poFederationChannelServer1.content.lastUserMessage.locator('div')).toHaveText('message from Server A'); - await expect(poFederationChannelServerUser2.content.lastUserMessage.locator('div')).toHaveText('message from Server A'); + await expect(poFederationChannelServer1.content.lastUserMessage).toHaveText('message from Server A'); + await expect(poFederationChannelServerUser2.content.lastUserMessage).toHaveText('message from Server A'); await poFederationChannelServerUser2.content.openLastMessageMenu(); await expect(poFederationChannelServerUser2.content.btnOptionReplyInThread).not.toBeVisible(); @@ -1235,8 +1235,8 @@ test.describe.parallel('Federation - DM Messaging', () => { await poFederationChannelServer1.content.sendMessageUsingEnter('message from Server A'); - await expect(poFederationChannelServer1.content.lastUserMessage.locator('div')).toHaveText('message from Server A'); - await expect(poFederationChannelServerUser2.content.lastUserMessage.locator('div')).toHaveText('message from Server A'); + await expect(poFederationChannelServer1.content.lastUserMessage).toHaveText('message from Server A'); + await expect(poFederationChannelServerUser2.content.lastUserMessage).toHaveText('message from Server A'); await poFederationChannelServer1.content.openLastMessageMenu(); await expect(poFederationChannelServer1.content.btnOptionStartDiscussion).not.toBeVisible(); @@ -1273,8 +1273,8 @@ test.describe.parallel('Federation - DM Messaging', () => { await poFederationChannelServerUser2.content.sendMessageUsingEnter('message from Server A'); - await expect(poFederationChannelServer1.content.lastUserMessage.locator('div')).toHaveText('message from Server A'); - await expect(poFederationChannelServerUser2.content.lastUserMessage.locator('div')).toHaveText('message from Server A'); + await expect(poFederationChannelServer1.content.lastUserMessage).toHaveText('message from Server A'); + await expect(poFederationChannelServerUser2.content.lastUserMessage).toHaveText('message from Server A'); await poFederationChannelServerUser2.content.openLastMessageMenu(); await expect(poFederationChannelServerUser2.content.btnOptionStartDiscussion).not.toBeVisible(); @@ -1311,8 +1311,8 @@ test.describe.parallel('Federation - DM Messaging', () => { await poFederationChannelServerUser2.content.sendMessageUsingEnter('message from Server A'); - await expect(poFederationChannelServer1.content.lastUserMessage.locator('div')).toHaveText('message from Server A'); - await expect(poFederationChannelServerUser2.content.lastUserMessage.locator('div')).toHaveText('message from Server A'); + await expect(poFederationChannelServer1.content.lastUserMessage).toHaveText('message from Server A'); + await expect(poFederationChannelServerUser2.content.lastUserMessage).toHaveText('message from Server A'); await poFederationChannelServer1.content.openLastMessageMenu(); await expect(poFederationChannelServer1.content.btnOptionPinMessage).not.toBeVisible(); @@ -1348,8 +1348,8 @@ test.describe.parallel('Federation - DM Messaging', () => { await poFederationChannelServerUser2.content.sendMessageUsingEnter('message from Server A'); - await expect(poFederationChannelServer1.content.lastUserMessage.locator('div')).toHaveText('message from Server A'); - await expect(poFederationChannelServerUser2.content.lastUserMessage.locator('div')).toHaveText('message from Server A'); + await expect(poFederationChannelServer1.content.lastUserMessage).toHaveText('message from Server A'); + await expect(poFederationChannelServerUser2.content.lastUserMessage).toHaveText('message from Server A'); await poFederationChannelServerUser2.content.openLastMessageMenu(); await expect(poFederationChannelServerUser2.content.btnOptionPinMessage).not.toBeVisible(); diff --git a/apps/meteor/tests/e2e/federation/tests/messaging/private.spec.ts b/apps/meteor/tests/e2e/federation/tests/messaging/private.spec.ts index e803b4a607849..371ca03b8c64a 100644 --- a/apps/meteor/tests/e2e/federation/tests/messaging/private.spec.ts +++ b/apps/meteor/tests/e2e/federation/tests/messaging/private.spec.ts @@ -92,8 +92,8 @@ test.describe.parallel('Federation - Group Messaging', () => { await poFederationChannelServer2.sidenav.openChat(createdGroupName); await poFederationChannelServer1.content.sendMessage('hello world from server A'); - await expect(poFederationChannelServer1.content.lastUserMessage.locator('div')).toHaveText('hello world from server A'); - await expect(poFederationChannelServer2.content.lastUserMessage.locator('div')).toHaveText('hello world from server A'); + await expect(poFederationChannelServer1.content.lastUserMessage).toHaveText('hello world from server A'); + await expect(poFederationChannelServer2.content.lastUserMessage).toHaveText('hello world from server A'); }); test('expect to send a message from Server B to Server A', async ({ page }) => { @@ -104,8 +104,8 @@ test.describe.parallel('Federation - Group Messaging', () => { await poFederationChannelServer2.sidenav.openChat(createdGroupName); await poFederationChannelServer2.content.sendMessage('hello world from server B'); - await expect(poFederationChannelServer1.content.lastUserMessage.locator('div')).toHaveText('hello world from server B'); - await expect(poFederationChannelServer2.content.lastUserMessage.locator('div')).toHaveText('hello world from server B'); + await expect(poFederationChannelServer1.content.lastUserMessage).toHaveText('hello world from server B'); + await expect(poFederationChannelServer2.content.lastUserMessage).toHaveText('hello world from server B'); }); test.describe('With multiple users', () => { @@ -140,9 +140,9 @@ test.describe.parallel('Federation - Group Messaging', () => { await poFederationChannelServer1.content.sendMessage('hello world from server A (creator)'); - await expect(poFederationChannelServer1.content.lastUserMessage.locator('div')).toHaveText('hello world from server A (creator)'); - await expect(poFederationChannel1ForUser2.content.lastUserMessage.locator('div')).toHaveText('hello world from server A (creator)'); - await expect(poFederationChannelServer2.content.lastUserMessage.locator('div')).toHaveText('hello world from server A (creator)'); + await expect(poFederationChannelServer1.content.lastUserMessage).toHaveText('hello world from server A (creator)'); + await expect(poFederationChannel1ForUser2.content.lastUserMessage).toHaveText('hello world from server A (creator)'); + await expect(poFederationChannelServer2.content.lastUserMessage).toHaveText('hello world from server A (creator)'); await pageForServer2.close(); await page2.close(); }); @@ -170,13 +170,13 @@ test.describe.parallel('Federation - Group Messaging', () => { await poFederationChannel1ForUser2.content.sendMessage('hello world from server A (user 2)'); await poFederationChannel1ForUser2.content.sendMessage('hello world from server A (user 2) message 2'); - await expect(poFederationChannelServer1.content.lastUserMessage.locator('div')).toHaveText( + await expect(poFederationChannelServer1.content.lastUserMessage).toHaveText( 'hello world from server A (user 2) message 2', ); - await expect(poFederationChannelServer2.content.lastUserMessage.locator('div')).toHaveText( + await expect(poFederationChannelServer2.content.lastUserMessage).toHaveText( 'hello world from server A (user 2) message 2', ); - await expect(poFederationChannel1ForUser2.content.lastUserMessage.locator('div')).toHaveText( + await expect(poFederationChannel1ForUser2.content.lastUserMessage).toHaveText( 'hello world from server A (user 2) message 2', ); @@ -207,9 +207,9 @@ test.describe.parallel('Federation - Group Messaging', () => { await poFederationChannelServer2.content.sendMessage('hello world from server B'); - await expect(poFederationChannelServer2.content.lastUserMessage.locator('div')).toHaveText('hello world from server B'); - await expect(poFederationChannelServer1.content.lastUserMessage.locator('div')).toHaveText('hello world from server B'); - await expect(poFederationChannel1ForUser2.content.lastUserMessage.locator('div')).toHaveText('hello world from server B'); + await expect(poFederationChannelServer2.content.lastUserMessage).toHaveText('hello world from server B'); + await expect(poFederationChannelServer1.content.lastUserMessage).toHaveText('hello world from server B'); + await expect(poFederationChannel1ForUser2.content.lastUserMessage).toHaveText('hello world from server B'); await pageForServer2.close(); await page2.close(); }); @@ -226,10 +226,10 @@ test.describe.parallel('Federation - Group Messaging', () => { await poFederationChannelServer1.content.sendMessage('😀 😀 hello world 🌎 from server A with emojis 😀 😀'); - await expect(poFederationChannelServer1.content.lastUserMessage.locator('div')).toHaveText( + await expect(poFederationChannelServer1.content.lastUserMessage).toHaveText( '😀 😀 hello world 🌎 from server A with emojis 😀 😀', ); - await expect(poFederationChannelServer2.content.lastUserMessage.locator('div')).toHaveText( + await expect(poFederationChannelServer2.content.lastUserMessage).toHaveText( '😀 😀 hello world 🌎 from server A with emojis 😀 😀', ); }); @@ -243,10 +243,10 @@ test.describe.parallel('Federation - Group Messaging', () => { await poFederationChannelServer2.content.sendMessage('😀 😀 hello world 🌎 from server B with emojis 😀 😀'); - await expect(poFederationChannelServer1.content.lastUserMessage.locator('div')).toHaveText( + await expect(poFederationChannelServer1.content.lastUserMessage).toHaveText( '😀 😀 hello world 🌎 from server B with emojis 😀 😀', ); - await expect(poFederationChannelServer2.content.lastUserMessage.locator('div')).toHaveText( + await expect(poFederationChannelServer2.content.lastUserMessage).toHaveText( '😀 😀 hello world 🌎 from server B with emojis 😀 😀', ); }); @@ -455,10 +455,10 @@ test.describe.parallel('Federation - Group Messaging', () => { `hello @${usernameWithDomainFromServer2}, here's @${constants.RC_SERVER_1.username} from Server A`, ); - await expect(poFederationChannelServer1.content.lastUserMessage.locator('div')).toHaveText( + await expect(poFederationChannelServer1.content.lastUserMessage).toHaveText( `hello ${usernameWithDomainFromServer2}, here's ${constants.RC_SERVER_1.username} from Server A`, ); - await expect(poFederationChannelServer2.content.lastUserMessage.locator('div')).toHaveText( + await expect(poFederationChannelServer2.content.lastUserMessage).toHaveText( `hello ${userFromServer2UsernameOnly}, here's ${adminUsernameWithDomainFromServer1} from Server A`, ); }); @@ -485,10 +485,10 @@ test.describe.parallel('Federation - Group Messaging', () => { `hello @${adminUsernameWithDomainFromServer1}, here's @${userFromServer2UsernameOnly} from Server B`, ); - await expect(poFederationChannelServer1.content.lastUserMessage.locator('div')).toHaveText( + await expect(poFederationChannelServer1.content.lastUserMessage).toHaveText( `hello ${constants.RC_SERVER_1.username}, here's ${usernameWithDomainFromServer2} from Server B`, ); - await expect(poFederationChannelServer2.content.lastUserMessage.locator('div')).toHaveText( + await expect(poFederationChannelServer2.content.lastUserMessage).toHaveText( `hello ${adminUsernameWithDomainFromServer1}, here's ${userFromServer2UsernameOnly} from Server B`, ); }); @@ -503,10 +503,10 @@ test.describe.parallel('Federation - Group Messaging', () => { `hello @${usernameWithDomainFromServer2}, here's @${constants.RC_SERVER_1.username} from Server A, @all, @${usernameWithDomainFromServer2}`, ); - await expect(poFederationChannelServer1.content.lastUserMessage.locator('div')).toHaveText( + await expect(poFederationChannelServer1.content.lastUserMessage).toHaveText( `hello ${usernameWithDomainFromServer2}, here's ${constants.RC_SERVER_1.username} from Server A, all, ${usernameWithDomainFromServer2}`, ); - await expect(poFederationChannelServer2.content.lastUserMessage.locator('div')).toHaveText( + await expect(poFederationChannelServer2.content.lastUserMessage).toHaveText( `hello ${userFromServer2UsernameOnly}, here's ${adminUsernameWithDomainFromServer1} from Server A, all, ${userFromServer2UsernameOnly}`, ); }); @@ -757,13 +757,13 @@ test.describe.parallel('Federation - Group Messaging', () => { await poFederationChannelServer1.content.sendMessageUsingEnter('message from Server A'); - await expect(poFederationChannelServer1.content.lastUserMessage.locator('div')).toHaveText('message from Server A'); - await expect(poFederationChannelServer2.content.lastUserMessage.locator('div')).toHaveText('message from Server A'); + await expect(poFederationChannelServer1.content.lastUserMessage).toHaveText('message from Server A'); + await expect(poFederationChannelServer2.content.lastUserMessage).toHaveText('message from Server A'); await poFederationChannelServer1.content.editLastMessage('message from Server A - Edited'); - await expect(poFederationChannelServer1.content.lastUserMessage.locator('div')).toHaveText('message from Server A - Edited'); - await expect(poFederationChannelServer2.content.lastUserMessage.locator('div')).toHaveText('message from Server A - Edited'); + await expect(poFederationChannelServer1.content.lastUserMessage).toHaveText('message from Server A - Edited'); + await expect(poFederationChannelServer2.content.lastUserMessage).toHaveText('message from Server A - Edited'); }); test('expect to edit a message from Server B to Server A', async ({ page }) => { @@ -778,13 +778,13 @@ test.describe.parallel('Federation - Group Messaging', () => { await poFederationChannelServer2.content.sendMessageUsingEnter('message from Server B'); - await expect(poFederationChannelServer2.content.lastUserMessage.locator('div')).toHaveText('message from Server B'); - await expect(poFederationChannelServer1.content.lastUserMessage.locator('div')).toHaveText('message from Server B'); + await expect(poFederationChannelServer2.content.lastUserMessage).toHaveText('message from Server B'); + await expect(poFederationChannelServer1.content.lastUserMessage).toHaveText('message from Server B'); await poFederationChannelServer2.content.editLastMessage('message from Server B - Edited'); - await expect(poFederationChannelServer2.content.lastUserMessage.locator('div')).toHaveText('message from Server B - Edited'); - await expect(poFederationChannelServer1.content.lastUserMessage.locator('div')).toHaveText('message from Server B - Edited'); + await expect(poFederationChannelServer2.content.lastUserMessage).toHaveText('message from Server B - Edited'); + await expect(poFederationChannelServer1.content.lastUserMessage).toHaveText('message from Server B - Edited'); }); test('expect to delete a message from Server A to Server B', async ({ page }) => { @@ -799,8 +799,8 @@ test.describe.parallel('Federation - Group Messaging', () => { await poFederationChannelServer1.content.sendMessageUsingEnter('message from Server A'); - await expect(poFederationChannelServer1.content.lastUserMessage.locator('div')).toHaveText('message from Server A'); - await expect(poFederationChannelServer2.content.lastUserMessage.locator('div')).toHaveText('message from Server A'); + await expect(poFederationChannelServer1.content.lastUserMessage).toHaveText('message from Server A'); + await expect(poFederationChannelServer2.content.lastUserMessage).toHaveText('message from Server A'); await poFederationChannelServer1.content.deleteLastMessage(); await expect(poFederationChannelServer1.toastSuccess).toBeVisible(); @@ -821,8 +821,8 @@ test.describe.parallel('Federation - Group Messaging', () => { await poFederationChannelServer2.content.sendMessageUsingEnter('message from Server A'); - await expect(poFederationChannelServer1.content.lastUserMessage.locator('div')).toHaveText('message from Server A'); - await expect(poFederationChannelServer2.content.lastUserMessage.locator('div')).toHaveText('message from Server A'); + await expect(poFederationChannelServer1.content.lastUserMessage).toHaveText('message from Server A'); + await expect(poFederationChannelServer2.content.lastUserMessage).toHaveText('message from Server A'); await poFederationChannelServer2.content.deleteLastMessage(); await expect(poFederationChannelServer2.toastSuccess).toBeVisible(); @@ -844,8 +844,8 @@ test.describe.parallel('Federation - Group Messaging', () => { const message = 'message from Server B'; await poFederationChannelServer2.content.sendMessageUsingEnter(message); - await expect(poFederationChannelServer1.content.lastUserMessage.locator('div')).toHaveText(message); - await expect(poFederationChannelServer2.content.lastUserMessage.locator('div')).toHaveText(message); + await expect(poFederationChannelServer1.content.lastUserMessage).toHaveText(message); + await expect(poFederationChannelServer2.content.lastUserMessage).toHaveText(message); await poFederationChannelServer1.content.replyInDm('reply directly in DM from server A'); @@ -868,8 +868,8 @@ test.describe.parallel('Federation - Group Messaging', () => { const message = 'message from Server A'; await poFederationChannelServer1.content.sendMessageUsingEnter(message); - await expect(poFederationChannelServer1.content.lastUserMessage.locator('div')).toHaveText(message); - await expect(poFederationChannelServer2.content.lastUserMessage.locator('div')).toHaveText(message); + await expect(poFederationChannelServer1.content.lastUserMessage).toHaveText(message); + await expect(poFederationChannelServer2.content.lastUserMessage).toHaveText(message); await poFederationChannelServer2.content.replyInDm('reply directly in DM from server B'); @@ -891,8 +891,8 @@ test.describe.parallel('Federation - Group Messaging', () => { await poFederationChannelServer1.content.sendMessageUsingEnter('message from Server A'); - await expect(poFederationChannelServer1.content.lastUserMessage.locator('div')).toHaveText('message from Server A'); - await expect(poFederationChannelServer2.content.lastUserMessage.locator('div')).toHaveText('message from Server A'); + await expect(poFederationChannelServer1.content.lastUserMessage).toHaveText('message from Server A'); + await expect(poFederationChannelServer2.content.lastUserMessage).toHaveText('message from Server A'); await poFederationChannelServer1.content.starLastMessage(); await expect( @@ -914,8 +914,8 @@ test.describe.parallel('Federation - Group Messaging', () => { await poFederationChannelServer2.content.sendMessageUsingEnter('message from Server A'); - await expect(poFederationChannelServer1.content.lastUserMessage.locator('div')).toHaveText('message from Server A'); - await expect(poFederationChannelServer2.content.lastUserMessage.locator('div')).toHaveText('message from Server A'); + await expect(poFederationChannelServer1.content.lastUserMessage).toHaveText('message from Server A'); + await expect(poFederationChannelServer2.content.lastUserMessage).toHaveText('message from Server A'); await poFederationChannelServer2.content.starLastMessage(); await expect( @@ -937,8 +937,8 @@ test.describe.parallel('Federation - Group Messaging', () => { await poFederationChannelServer1.content.sendMessageUsingEnter('message from Server A'); - await expect(poFederationChannelServer1.content.lastUserMessage.locator('div')).toHaveText('message from Server A'); - await expect(poFederationChannelServer2.content.lastUserMessage.locator('div')).toHaveText('message from Server A'); + await expect(poFederationChannelServer1.content.lastUserMessage).toHaveText('message from Server A'); + await expect(poFederationChannelServer2.content.lastUserMessage).toHaveText('message from Server A'); await poFederationChannelServer1.content.openLastMessageMenu(); await expect(poFederationChannelServer1.content.btnOptionReplyInThread).not.toBeVisible(); @@ -956,8 +956,8 @@ test.describe.parallel('Federation - Group Messaging', () => { await poFederationChannelServer2.content.sendMessageUsingEnter('message from Server A'); - await expect(poFederationChannelServer1.content.lastUserMessage.locator('div')).toHaveText('message from Server A'); - await expect(poFederationChannelServer2.content.lastUserMessage.locator('div')).toHaveText('message from Server A'); + await expect(poFederationChannelServer1.content.lastUserMessage).toHaveText('message from Server A'); + await expect(poFederationChannelServer2.content.lastUserMessage).toHaveText('message from Server A'); await poFederationChannelServer2.content.openLastMessageMenu(); await expect(poFederationChannelServer2.content.btnOptionReplyInThread).not.toBeVisible(); @@ -975,8 +975,8 @@ test.describe.parallel('Federation - Group Messaging', () => { await poFederationChannelServer1.content.sendMessageUsingEnter('message from Server A'); - await expect(poFederationChannelServer1.content.lastUserMessage.locator('div')).toHaveText('message from Server A'); - await expect(poFederationChannelServer2.content.lastUserMessage.locator('div')).toHaveText('message from Server A'); + await expect(poFederationChannelServer1.content.lastUserMessage).toHaveText('message from Server A'); + await expect(poFederationChannelServer2.content.lastUserMessage).toHaveText('message from Server A'); await poFederationChannelServer1.content.openLastMessageMenu(); await expect(poFederationChannelServer1.content.btnOptionStartDiscussion).not.toBeVisible(); @@ -994,8 +994,8 @@ test.describe.parallel('Federation - Group Messaging', () => { await poFederationChannelServer2.content.sendMessageUsingEnter('message from Server A'); - await expect(poFederationChannelServer1.content.lastUserMessage.locator('div')).toHaveText('message from Server A'); - await expect(poFederationChannelServer2.content.lastUserMessage.locator('div')).toHaveText('message from Server A'); + await expect(poFederationChannelServer1.content.lastUserMessage).toHaveText('message from Server A'); + await expect(poFederationChannelServer2.content.lastUserMessage).toHaveText('message from Server A'); await poFederationChannelServer2.content.openLastMessageMenu(); await expect(poFederationChannelServer2.content.btnOptionStartDiscussion).not.toBeVisible(); @@ -1013,8 +1013,8 @@ test.describe.parallel('Federation - Group Messaging', () => { await poFederationChannelServer2.content.sendMessageUsingEnter('message from Server A'); - await expect(poFederationChannelServer1.content.lastUserMessage.locator('div')).toHaveText('message from Server A'); - await expect(poFederationChannelServer2.content.lastUserMessage.locator('div')).toHaveText('message from Server A'); + await expect(poFederationChannelServer1.content.lastUserMessage).toHaveText('message from Server A'); + await expect(poFederationChannelServer2.content.lastUserMessage).toHaveText('message from Server A'); await poFederationChannelServer1.content.openLastMessageMenu(); await expect(poFederationChannelServer1.content.btnOptionPinMessage).not.toBeVisible(); @@ -1032,8 +1032,8 @@ test.describe.parallel('Federation - Group Messaging', () => { await poFederationChannelServer2.content.sendMessageUsingEnter('message from Server A'); - await expect(poFederationChannelServer1.content.lastUserMessage.locator('div')).toHaveText('message from Server A'); - await expect(poFederationChannelServer2.content.lastUserMessage.locator('div')).toHaveText('message from Server A'); + await expect(poFederationChannelServer1.content.lastUserMessage).toHaveText('message from Server A'); + await expect(poFederationChannelServer2.content.lastUserMessage).toHaveText('message from Server A'); await poFederationChannelServer2.content.openLastMessageMenu(); await expect(poFederationChannelServer2.content.btnOptionPinMessage).not.toBeVisible(); diff --git a/apps/meteor/tests/e2e/federation/tests/messaging/public.spec.ts b/apps/meteor/tests/e2e/federation/tests/messaging/public.spec.ts index af2ebcc23bf40..5b8c7330e33ad 100644 --- a/apps/meteor/tests/e2e/federation/tests/messaging/public.spec.ts +++ b/apps/meteor/tests/e2e/federation/tests/messaging/public.spec.ts @@ -92,8 +92,8 @@ test.describe.parallel('Federation - Channel Messaging', () => { await poFederationChannelServer2.sidenav.openChat(createdChannelName); await poFederationChannelServer1.content.sendMessage('hello world from server A'); - await expect(poFederationChannelServer1.content.lastUserMessage.locator('div')).toHaveText('hello world from server A'); - await expect(poFederationChannelServer2.content.lastUserMessage.locator('div')).toHaveText('hello world from server A'); + await expect(poFederationChannelServer1.content.lastUserMessage).toHaveText('hello world from server A'); + await expect(poFederationChannelServer2.content.lastUserMessage).toHaveText('hello world from server A'); }); test('expect to send a message from Server B to Server A', async ({ page }) => { @@ -104,8 +104,8 @@ test.describe.parallel('Federation - Channel Messaging', () => { await poFederationChannelServer2.sidenav.openChat(createdChannelName); await poFederationChannelServer2.content.sendMessage('hello world from server B'); - await expect(poFederationChannelServer1.content.lastUserMessage.locator('div')).toHaveText('hello world from server B'); - await expect(poFederationChannelServer2.content.lastUserMessage.locator('div')).toHaveText('hello world from server B'); + await expect(poFederationChannelServer1.content.lastUserMessage).toHaveText('hello world from server B'); + await expect(poFederationChannelServer2.content.lastUserMessage).toHaveText('hello world from server B'); }); test.describe('With multiple users', () => { @@ -140,9 +140,9 @@ test.describe.parallel('Federation - Channel Messaging', () => { await poFederationChannelServer1.content.sendMessage('hello world from server A (creator)'); - await expect(poFederationChannelServer1.content.lastUserMessage.locator('div')).toHaveText('hello world from server A (creator)'); - await expect(poFederationChannel1ForUser2.content.lastUserMessage.locator('div')).toHaveText('hello world from server A (creator)'); - await expect(poFederationChannelServer2.content.lastUserMessage.locator('div')).toHaveText('hello world from server A (creator)'); + await expect(poFederationChannelServer1.content.lastUserMessage).toHaveText('hello world from server A (creator)'); + await expect(poFederationChannel1ForUser2.content.lastUserMessage).toHaveText('hello world from server A (creator)'); + await expect(poFederationChannelServer2.content.lastUserMessage).toHaveText('hello world from server A (creator)'); await pageForServer2.close(); await page2.close(); }); @@ -171,13 +171,13 @@ test.describe.parallel('Federation - Channel Messaging', () => { await poFederationChannel1ForUser2.content.sendMessage('hello world from server A (user 2)'); await poFederationChannel1ForUser2.content.sendMessage('hello world from server A (user 2) message 2'); - await expect(poFederationChannelServer2.content.lastUserMessage.locator('div')).toHaveText( + await expect(poFederationChannelServer2.content.lastUserMessage).toHaveText( 'hello world from server A (user 2) message 2', ); - await expect(poFederationChannelServer1.content.lastUserMessage.locator('div')).toHaveText( + await expect(poFederationChannelServer1.content.lastUserMessage).toHaveText( 'hello world from server A (user 2) message 2', ); - await expect(poFederationChannel1ForUser2.content.lastUserMessage.locator('div')).toHaveText( + await expect(poFederationChannel1ForUser2.content.lastUserMessage).toHaveText( 'hello world from server A (user 2) message 2', ); @@ -209,9 +209,9 @@ test.describe.parallel('Federation - Channel Messaging', () => { await poFederationChannelServer2.content.sendMessage('hello world from server B'); - await expect(poFederationChannelServer2.content.lastUserMessage.locator('div')).toHaveText('hello world from server B'); - await expect(poFederationChannel1ForUser2.content.lastUserMessage.locator('div')).toHaveText('hello world from server B'); - await expect(poFederationChannelServer1.content.lastUserMessage.locator('div')).toHaveText('hello world from server B'); + await expect(poFederationChannelServer2.content.lastUserMessage).toHaveText('hello world from server B'); + await expect(poFederationChannel1ForUser2.content.lastUserMessage).toHaveText('hello world from server B'); + await expect(poFederationChannelServer1.content.lastUserMessage).toHaveText('hello world from server B'); await pageForServer2.close(); await page2.close(); }); @@ -228,10 +228,10 @@ test.describe.parallel('Federation - Channel Messaging', () => { await poFederationChannelServer1.content.sendMessage('😀 😀 hello world 🌎 from server A with emojis 😀 😀'); - await expect(poFederationChannelServer1.content.lastUserMessage.locator('div')).toHaveText( + await expect(poFederationChannelServer1.content.lastUserMessage).toHaveText( '😀 😀 hello world 🌎 from server A with emojis 😀 😀', ); - await expect(poFederationChannelServer2.content.lastUserMessage.locator('div')).toHaveText( + await expect(poFederationChannelServer2.content.lastUserMessage).toHaveText( '😀 😀 hello world 🌎 from server A with emojis 😀 😀', ); }); @@ -245,10 +245,10 @@ test.describe.parallel('Federation - Channel Messaging', () => { await poFederationChannelServer2.content.sendMessage('😀 😀 hello world 🌎 from server B with emojis 😀 😀'); - await expect(poFederationChannelServer1.content.lastUserMessage.locator('div')).toHaveText( + await expect(poFederationChannelServer1.content.lastUserMessage).toHaveText( '😀 😀 hello world 🌎 from server B with emojis 😀 😀', ); - await expect(poFederationChannelServer2.content.lastUserMessage.locator('div')).toHaveText( + await expect(poFederationChannelServer2.content.lastUserMessage).toHaveText( '😀 😀 hello world 🌎 from server B with emojis 😀 😀', ); }); @@ -451,10 +451,10 @@ test.describe.parallel('Federation - Channel Messaging', () => { `hello @${usernameWithDomainFromServer2}, here's @${constants.RC_SERVER_1.username} from Server A`, ); - await expect(poFederationChannelServer1.content.lastUserMessage.locator('div')).toHaveText( + await expect(poFederationChannelServer1.content.lastUserMessage).toHaveText( `hello ${usernameWithDomainFromServer2}, here's ${constants.RC_SERVER_1.username} from Server A`, ); - await expect(poFederationChannelServer2.content.lastUserMessage.locator('div')).toHaveText( + await expect(poFederationChannelServer2.content.lastUserMessage).toHaveText( `hello ${userFromServer2UsernameOnly}, here's ${adminUsernameWithDomainFromServer1} from Server A`, ); }); @@ -481,10 +481,10 @@ test.describe.parallel('Federation - Channel Messaging', () => { `hello @${adminUsernameWithDomainFromServer1}, here's @${userFromServer2UsernameOnly} from Server B`, ); - await expect(poFederationChannelServer1.content.lastUserMessage.locator('div')).toHaveText( + await expect(poFederationChannelServer1.content.lastUserMessage).toHaveText( `hello ${constants.RC_SERVER_1.username}, here's ${usernameWithDomainFromServer2} from Server B`, ); - await expect(poFederationChannelServer2.content.lastUserMessage.locator('div')).toHaveText( + await expect(poFederationChannelServer2.content.lastUserMessage).toHaveText( `hello ${adminUsernameWithDomainFromServer1}, here's ${userFromServer2UsernameOnly} from Server B`, ); }); @@ -499,10 +499,10 @@ test.describe.parallel('Federation - Channel Messaging', () => { `hello @${usernameWithDomainFromServer2}, here's @${constants.RC_SERVER_1.username} from Server A, @all, @${usernameWithDomainFromServer2}`, ); - await expect(poFederationChannelServer1.content.lastUserMessage.locator('div')).toHaveText( + await expect(poFederationChannelServer1.content.lastUserMessage).toHaveText( `hello ${usernameWithDomainFromServer2}, here's ${constants.RC_SERVER_1.username} from Server A, all, ${usernameWithDomainFromServer2}`, ); - await expect(poFederationChannelServer2.content.lastUserMessage.locator('div')).toHaveText( + await expect(poFederationChannelServer2.content.lastUserMessage).toHaveText( `hello ${userFromServer2UsernameOnly}, here's ${adminUsernameWithDomainFromServer1} from Server A, all, ${userFromServer2UsernameOnly}`, ); }); @@ -751,13 +751,13 @@ test.describe.parallel('Federation - Channel Messaging', () => { await poFederationChannelServer1.content.sendMessageUsingEnter('message from Server A'); - await expect(poFederationChannelServer1.content.lastUserMessage.locator('div')).toHaveText('message from Server A'); - await expect(poFederationChannelServer2.content.lastUserMessage.locator('div')).toHaveText('message from Server A'); + await expect(poFederationChannelServer1.content.lastUserMessage).toHaveText('message from Server A'); + await expect(poFederationChannelServer2.content.lastUserMessage).toHaveText('message from Server A'); await poFederationChannelServer1.content.editLastMessage('message from Server A - Edited'); - await expect(poFederationChannelServer1.content.lastUserMessage.locator('div')).toHaveText('message from Server A - Edited'); - await expect(poFederationChannelServer2.content.lastUserMessage.locator('div')).toHaveText('message from Server A - Edited'); + await expect(poFederationChannelServer1.content.lastUserMessage).toHaveText('message from Server A - Edited'); + await expect(poFederationChannelServer2.content.lastUserMessage).toHaveText('message from Server A - Edited'); }); test('expect to edit a message from Server B to Server A', async ({ page }) => { @@ -772,13 +772,13 @@ test.describe.parallel('Federation - Channel Messaging', () => { await poFederationChannelServer2.content.sendMessageUsingEnter('message from Server B'); - await expect(poFederationChannelServer2.content.lastUserMessage.locator('div')).toHaveText('message from Server B'); - await expect(poFederationChannelServer1.content.lastUserMessage.locator('div')).toHaveText('message from Server B'); + await expect(poFederationChannelServer2.content.lastUserMessage).toHaveText('message from Server B'); + await expect(poFederationChannelServer1.content.lastUserMessage).toHaveText('message from Server B'); await poFederationChannelServer2.content.editLastMessage('message from Server B - Edited'); - await expect(poFederationChannelServer2.content.lastUserMessage.locator('div')).toHaveText('message from Server B - Edited'); - await expect(poFederationChannelServer1.content.lastUserMessage.locator('div')).toHaveText('message from Server B - Edited'); + await expect(poFederationChannelServer2.content.lastUserMessage).toHaveText('message from Server B - Edited'); + await expect(poFederationChannelServer1.content.lastUserMessage).toHaveText('message from Server B - Edited'); }); test('expect to delete a message from Server A to Server B', async ({ page }) => { @@ -793,8 +793,8 @@ test.describe.parallel('Federation - Channel Messaging', () => { await poFederationChannelServer1.content.sendMessageUsingEnter('message from Server A'); - await expect(poFederationChannelServer1.content.lastUserMessage.locator('div')).toHaveText('message from Server A'); - await expect(poFederationChannelServer2.content.lastUserMessage.locator('div')).toHaveText('message from Server A'); + await expect(poFederationChannelServer1.content.lastUserMessage).toHaveText('message from Server A'); + await expect(poFederationChannelServer2.content.lastUserMessage).toHaveText('message from Server A'); await poFederationChannelServer1.content.deleteLastMessage(); await expect(poFederationChannelServer1.toastSuccess).toBeVisible(); @@ -815,8 +815,8 @@ test.describe.parallel('Federation - Channel Messaging', () => { await poFederationChannelServer2.content.sendMessageUsingEnter('message from Server A'); - await expect(poFederationChannelServer1.content.lastUserMessage.locator('div')).toHaveText('message from Server A'); - await expect(poFederationChannelServer2.content.lastUserMessage.locator('div')).toHaveText('message from Server A'); + await expect(poFederationChannelServer1.content.lastUserMessage).toHaveText('message from Server A'); + await expect(poFederationChannelServer2.content.lastUserMessage).toHaveText('message from Server A'); await poFederationChannelServer2.content.deleteLastMessage(); await expect(poFederationChannelServer2.toastSuccess).toBeVisible(); @@ -838,8 +838,8 @@ test.describe.parallel('Federation - Channel Messaging', () => { const message = 'message from Server B'; await poFederationChannelServer2.content.sendMessageUsingEnter(message); - await expect(poFederationChannelServer1.content.lastUserMessage.locator('div')).toHaveText(message); - await expect(poFederationChannelServer2.content.lastUserMessage.locator('div')).toHaveText(message); + await expect(poFederationChannelServer1.content.lastUserMessage).toHaveText(message); + await expect(poFederationChannelServer2.content.lastUserMessage).toHaveText(message); await poFederationChannelServer1.content.replyInDm('reply directly in DM from server A'); @@ -862,8 +862,8 @@ test.describe.parallel('Federation - Channel Messaging', () => { const message = 'message from Server A'; await poFederationChannelServer1.content.sendMessageUsingEnter(message); - await expect(poFederationChannelServer1.content.lastUserMessage.locator('div')).toHaveText(message); - await expect(poFederationChannelServer2.content.lastUserMessage.locator('div')).toHaveText(message); + await expect(poFederationChannelServer1.content.lastUserMessage).toHaveText(message); + await expect(poFederationChannelServer2.content.lastUserMessage).toHaveText(message); await poFederationChannelServer2.content.replyInDm('reply directly in DM from server B'); @@ -885,8 +885,8 @@ test.describe.parallel('Federation - Channel Messaging', () => { await poFederationChannelServer1.content.sendMessageUsingEnter('message from Server A'); - await expect(poFederationChannelServer1.content.lastUserMessage.locator('div')).toHaveText('message from Server A'); - await expect(poFederationChannelServer2.content.lastUserMessage.locator('div')).toHaveText('message from Server A'); + await expect(poFederationChannelServer1.content.lastUserMessage).toHaveText('message from Server A'); + await expect(poFederationChannelServer2.content.lastUserMessage).toHaveText('message from Server A'); await poFederationChannelServer1.content.starLastMessage(); await expect( @@ -908,8 +908,8 @@ test.describe.parallel('Federation - Channel Messaging', () => { await poFederationChannelServer2.content.sendMessageUsingEnter('message from Server A'); - await expect(poFederationChannelServer1.content.lastUserMessage.locator('div')).toHaveText('message from Server A'); - await expect(poFederationChannelServer2.content.lastUserMessage.locator('div')).toHaveText('message from Server A'); + await expect(poFederationChannelServer1.content.lastUserMessage).toHaveText('message from Server A'); + await expect(poFederationChannelServer2.content.lastUserMessage).toHaveText('message from Server A'); await poFederationChannelServer2.content.starLastMessage(); await expect( @@ -931,8 +931,8 @@ test.describe.parallel('Federation - Channel Messaging', () => { await poFederationChannelServer1.content.sendMessageUsingEnter('message from Server A'); - await expect(poFederationChannelServer1.content.lastUserMessage.locator('div')).toHaveText('message from Server A'); - await expect(poFederationChannelServer2.content.lastUserMessage.locator('div')).toHaveText('message from Server A'); + await expect(poFederationChannelServer1.content.lastUserMessage).toHaveText('message from Server A'); + await expect(poFederationChannelServer2.content.lastUserMessage).toHaveText('message from Server A'); await poFederationChannelServer1.content.openLastMessageMenu(); await expect(poFederationChannelServer1.content.btnOptionReplyInThread).not.toBeVisible(); @@ -950,8 +950,8 @@ test.describe.parallel('Federation - Channel Messaging', () => { await poFederationChannelServer2.content.sendMessageUsingEnter('message from Server A'); - await expect(poFederationChannelServer1.content.lastUserMessage.locator('div')).toHaveText('message from Server A'); - await expect(poFederationChannelServer2.content.lastUserMessage.locator('div')).toHaveText('message from Server A'); + await expect(poFederationChannelServer1.content.lastUserMessage).toHaveText('message from Server A'); + await expect(poFederationChannelServer2.content.lastUserMessage).toHaveText('message from Server A'); await poFederationChannelServer2.content.openLastMessageMenu(); await expect(poFederationChannelServer2.content.btnOptionReplyInThread).not.toBeVisible(); @@ -969,8 +969,8 @@ test.describe.parallel('Federation - Channel Messaging', () => { await poFederationChannelServer1.content.sendMessageUsingEnter('message from Server A'); - await expect(poFederationChannelServer1.content.lastUserMessage.locator('div')).toHaveText('message from Server A'); - await expect(poFederationChannelServer2.content.lastUserMessage.locator('div')).toHaveText('message from Server A'); + await expect(poFederationChannelServer1.content.lastUserMessage).toHaveText('message from Server A'); + await expect(poFederationChannelServer2.content.lastUserMessage).toHaveText('message from Server A'); await poFederationChannelServer1.content.openLastMessageMenu(); await expect(poFederationChannelServer1.content.btnOptionStartDiscussion).not.toBeVisible(); @@ -988,8 +988,8 @@ test.describe.parallel('Federation - Channel Messaging', () => { await poFederationChannelServer2.content.sendMessageUsingEnter('message from Server A'); - await expect(poFederationChannelServer1.content.lastUserMessage.locator('div')).toHaveText('message from Server A'); - await expect(poFederationChannelServer2.content.lastUserMessage.locator('div')).toHaveText('message from Server A'); + await expect(poFederationChannelServer1.content.lastUserMessage).toHaveText('message from Server A'); + await expect(poFederationChannelServer2.content.lastUserMessage).toHaveText('message from Server A'); await poFederationChannelServer2.content.openLastMessageMenu(); await expect(poFederationChannelServer2.content.btnOptionStartDiscussion).not.toBeVisible(); @@ -1007,8 +1007,8 @@ test.describe.parallel('Federation - Channel Messaging', () => { await poFederationChannelServer2.content.sendMessageUsingEnter('message from Server A'); - await expect(poFederationChannelServer1.content.lastUserMessage.locator('div')).toHaveText('message from Server A'); - await expect(poFederationChannelServer2.content.lastUserMessage.locator('div')).toHaveText('message from Server A'); + await expect(poFederationChannelServer1.content.lastUserMessage).toHaveText('message from Server A'); + await expect(poFederationChannelServer2.content.lastUserMessage).toHaveText('message from Server A'); await poFederationChannelServer1.content.openLastMessageMenu(); await expect(poFederationChannelServer1.content.btnOptionPinMessage).not.toBeVisible(); @@ -1026,8 +1026,8 @@ test.describe.parallel('Federation - Channel Messaging', () => { await poFederationChannelServer2.content.sendMessageUsingEnter('message from Server A'); - await expect(poFederationChannelServer1.content.lastUserMessage.locator('div')).toHaveText('message from Server A'); - await expect(poFederationChannelServer2.content.lastUserMessage.locator('div')).toHaveText('message from Server A'); + await expect(poFederationChannelServer1.content.lastUserMessage).toHaveText('message from Server A'); + await expect(poFederationChannelServer2.content.lastUserMessage).toHaveText('message from Server A'); await poFederationChannelServer2.content.openLastMessageMenu(); await expect(poFederationChannelServer2.content.btnOptionPinMessage).not.toBeVisible(); diff --git a/apps/meteor/tests/e2e/messaging.spec.ts b/apps/meteor/tests/e2e/messaging.spec.ts index 61b29fdf9585f..32e70e9a0e97f 100644 --- a/apps/meteor/tests/e2e/messaging.spec.ts +++ b/apps/meteor/tests/e2e/messaging.spec.ts @@ -29,8 +29,8 @@ test.describe.serial('Messaging', () => { await poHomeChannel.content.sendMessage('hello world'); - await expect(auxContext.poHomeChannel.content.lastUserMessage.locator('div')).toHaveText('hello world'); - await expect(poHomeChannel.content.lastUserMessage.locator('div')).toHaveText('hello world'); + await expect(auxContext.poHomeChannel.content.lastUserMessage).toHaveText('hello world'); + await expect(poHomeChannel.content.lastUserMessage).toHaveText('hello world'); await auxContext.page.close(); }); @@ -43,8 +43,8 @@ test.describe.serial('Messaging', () => { await poHomeChannel.content.sendMessage('hello world'); - await expect(poHomeChannel.content.lastUserMessage.locator('div')).toHaveText('hello world'); - await expect(auxContext.poHomeChannel.content.lastUserMessage.locator('div')).toHaveText('hello world'); + await expect(poHomeChannel.content.lastUserMessage).toHaveText('hello world'); + await expect(auxContext.poHomeChannel.content.lastUserMessage).toHaveText('hello world'); await auxContext.page.close(); });