Merge pull request #7 from Bilb/fix-test-with-groups

fix: fix the non-groups test for the groups changes

Author: burtonemily

sessionReporter.ts

@@ -99,6 +99,17 @@ class SessionReporter implements Reporter {
 
       console.warn('stderr:');
       result.stderr.map((t) => process.stderr.write(t.toString()));
+
+      if (result.error) {
+        if (result.error.message) {
+          console.warn('\nmessage:');
+          process.stderr.write(result.error.message.toString());
+        }
+        if (result.error.stack) {
+          console.warn('\nstack:');
+          process.stderr.write(result.error.stack.toString());
+        }
+      }
     } else {
       console.log(
         `${getChalkColorForStatus(result)(

tests/automation/group_testing.spec.ts

@@ -9,7 +9,7 @@ import {
   waitForTestIdWithText,
 } from './utilities/utils';
 // import { leaveGroup } from './utilities/leave_group';
-import { sleepFor } from '../promise_utils';
+import { doForAll, sleepFor } from '../promise_utils';
 import { newUser } from './setup/new_user';
 import {
   sessionTestThreeWindows,
@@ -18,7 +18,6 @@ import {
 } from './setup/sessionTest';
 import { createContact } from './utilities/create_contact';
 import { leaveGroup } from './utilities/leave_group';
-import { shortenWithBrackets } from '../pubkey';
 import { englishStrippedStr } from '../locale/localizedString';
 
 // Note: Note using the group fixture here as we want to test it thoroughly
@@ -85,26 +84,19 @@ test_group_Alice_1W_Bob_1W_Charlie_1W_Dracula_1W(
       aliceWindow1,
       englishStrippedStr('okay').toString(),
     );
-    await waitForTestIdWithText(
-      aliceWindow1,
-      'group-update-message',
-      englishStrippedStr('legacyGroupMemberNew')
-        .withArgs({ name: dracula.userName })
-        .toString(),
-    );
-    await waitForTestIdWithText(
-      bobWindow1,
-      'group-update-message',
-      englishStrippedStr('legacyGroupMemberNew')
-        .withArgs({ name: shortenWithBrackets(dracula.accountid) })
-        .toString(),
-    );
-    await waitForTestIdWithText(
-      charlieWindow1,
-      'group-update-message',
-      englishStrippedStr('legacyGroupMemberNew')
-        .withArgs({ name: shortenWithBrackets(dracula.accountid) })
-        .toString(),
+    // even if Bob and Charlie do not know Dracula's name,
+    // Alice sets Dracula's name in the group members that every one will use as a fallback
+    await doForAll(
+      async (w) => {
+        return waitForTestIdWithText(
+          w,
+          'group-update-message',
+          englishStrippedStr('groupMemberNew')
+            .withArgs({ name: dracula.userName })
+            .toString(),
+        );
+      },
+      [aliceWindow1, bobWindow1, charlieWindow1],
     );
     await clickOnElement({
       window: draculaWindow1,

tests/automation/linked_device_user.spec.ts

@@ -276,9 +276,7 @@ test_Alice_2W_Bob_1W(
     await hasTextMessageBeenDeleted(aliceWindow1, unsentMessage, 1000);
     await waitForMatchingText(
       bobWindow1,
-      englishStrippedStr('deleteMessageDeleted')
-        .withArgs({ count: 1 })
-        .toString(),
+      englishStrippedStr('deleteMessageDeletedGlobally').toString(),
     );
     // linked device for deleted message
     await hasTextMessageBeenDeleted(aliceWindow2, unsentMessage, 1000);

tests/automation/message_checks.spec.ts

@@ -262,9 +262,7 @@ test_Alice_1W_Bob_1W(
     await sleepFor(1000);
     await waitForMatchingText(
       bobWindow1,
-      englishStrippedStr('deleteMessageDeleted')
-        .withArgs({ count: 1 })
-        .toString(),
+      englishStrippedStr('deleteMessageDeletedGlobally').toString(),
     );
   },
 );

tests/automation/message_checks_groups.spec.ts

@@ -1,5 +1,5 @@
 import { englishStrippedStr } from '../locale/localizedString';
-import { sleepFor } from '../promise_utils';
+import { doForAll, sleepFor } from '../promise_utils';
 import { test_group_Alice_1W_Bob_1W_Charlie_1W } from './setup/sessionTest';
 import { sendMessage } from './utilities/message';
 import { replyTo } from './utilities/reply_message';
@@ -252,15 +252,11 @@ test_group_Alice_1W_Bob_1W_Charlie_1W(
     await sleepFor(1000);
     await waitForMatchingText(
       bobWindow1,
-      englishStrippedStr('deleteMessageDeleted')
-        .withArgs({ count: 1 })
-        .toString(),
+      englishStrippedStr('deleteMessageDeletedGlobally').toString(),
     );
     await waitForMatchingText(
       charlieWindow1,
-      englishStrippedStr('deleteMessageDeleted')
-        .withArgs({ count: 1 })
-        .toString(),
+      englishStrippedStr('deleteMessageDeletedGlobally').toString(),
     );
   },
 );
@@ -293,9 +289,19 @@ test_group_Alice_1W_Bob_1W_Charlie_1W(
         .withArgs({ count: 1 })
         .toString(),
     );
-    await hasTextMessageBeenDeleted(aliceWindow1, deletedMessage, 5000);
-    // Should still be there for user B and C
-    await waitForMatchingText(bobWindow1, deletedMessage);
-    await waitForMatchingText(charlieWindow1, deletedMessage);
+    await doForAll(
+      async (w) => {
+        if (w !== aliceWindow1) {
+          // we should have the "This message was deleted" placeholder only where the change wasn't made
+          await waitForMatchingText(
+            w,
+            englishStrippedStr('deleteMessageDeletedGlobally').toString(),
+          );
+        }
+        // the message should be gone on all windows
+        await hasTextMessageBeenDeleted(w, deletedMessage, 5000);
+      },
+      [aliceWindow1, bobWindow1, charlieWindow1],
+    );
   },
 );

tests/automation/setup/create_group.ts

@@ -7,9 +7,10 @@ import {
   clickOnTestIdWithText,
   typeIntoInput,
   waitForTestIdWithText,
-  waitForTextMessage,
+  waitForTextMessages,
 } from '../utilities/utils';
 import { englishStrippedStr } from '../../locale/localizedString';
+import { doForAll } from '../../promise_utils';
 
 export const createGroup = async (
   userName: string,
@@ -21,8 +22,10 @@ export const createGroup = async (
   windowC: Page,
 ): Promise<Group> => {
   const group: Group = { userName, userOne, userTwo, userThree };
-  const emptyStateGroupText = englishStrippedStr('groupNoMessages')
-    .withArgs({ group_name: group.userName })
+  const groupUpdateInviteControlText = englishStrippedStr(
+    'groupInviteYouAndMoreNew',
+  )
+    .withArgs({ count: 2 })
     .toString();
 
   const messageAB = `${userOne.userName} to ${userTwo.userName}`;
@@ -67,7 +70,7 @@ export const createGroup = async (
   // Select user C
   await clickOnMatchingText(windowA, userThree.userName);
   // Click Next
-  await clickOnTestIdWithText(windowA, 'next-button');
+  await clickOnTestIdWithText(windowA, 'create-group-button');
   // Check group was successfully created
   await clickOnMatchingText(windowB, group.userName);
   await waitForTestIdWithText(
@@ -76,38 +79,29 @@ export const createGroup = async (
     group.userName,
   );
   // Make sure the empty state is in windowA
+  // Updated in group v2
   await waitForTestIdWithText(
     windowA,
-    'empty-conversation-notification',
-    emptyStateGroupText,
+    'group-update-message',
+    groupUpdateInviteControlText,
   );
 
-  await Promise.all([
-    (async () => {
-      // Navigate to group in window B
-      await clickOnTestIdWithText(windowB, 'message-section');
+  // Make sure the empty state is in windowB & windowC
+  await doForAll(
+    async (w) => {
+      // Navigate to group in the window
+      await clickOnTestIdWithText(w, 'message-section');
       // Click on test group
-      await clickOnMatchingText(windowB, group.userName);
-      // Make sure the empty state is in windowB
+      await clickOnMatchingText(w, group.userName);
+      // Make sure the empty state is in w
       return waitForTestIdWithText(
-        windowB,
-        'empty-conversation-notification',
-        emptyStateGroupText,
+        w,
+        'group-update-message',
+        groupUpdateInviteControlText,
       );
-    })(),
-    (async () => {
-      // Navigate to group in window C
-      await clickOnTestIdWithText(windowC, 'message-section');
-      // Click on test group
-      await clickOnMatchingText(windowC, group.userName);
-      // Make sure the empty state is in windowC
-      return waitForTestIdWithText(
-        windowC,
-        'empty-conversation-notification',
-        emptyStateGroupText,
-      );
-    })(),
-  ]);
+    },
+    [windowB, windowC],
+  );
 
   // Send message in group chat from user A
   await sendMessage(windowA, msgAToGroup);
@@ -125,16 +119,13 @@ export const createGroup = async (
   // Verify that each messages was received by the other two accounts
 
   // windowA should see the message from B and the message from C
-  await waitForTextMessage(windowA, msgBToGroup);
-  await waitForTextMessage(windowA, msgCToGroup);
+  await waitForTextMessages(windowA, [msgBToGroup, msgCToGroup]);
 
   // windowB should see the message from A and the message from C
-  await waitForTextMessage(windowB, msgAToGroup);
-  await waitForTextMessage(windowB, msgCToGroup);
+  await waitForTextMessages(windowB, [msgAToGroup, msgCToGroup]);
 
   // windowC must see the message from A and the message from B
-  await waitForTextMessage(windowC, msgAToGroup);
-  await waitForTextMessage(windowC, msgBToGroup);
+  await waitForTextMessages(windowC, [msgAToGroup, msgBToGroup]);
 
   // Focus screen
   // await clickOnTestIdWithText(windowB, 'scroll-to-bottom-button');

tests/automation/setup/sessionTest.ts

@@ -1,5 +1,7 @@
 /* eslint-disable no-empty-pattern */
 /* eslint-disable @typescript-eslint/array-type */
+import chalk from 'chalk';
+
 import { Page, TestInfo, test } from '@playwright/test';
 import { Group, User } from '../types/testing';
 import { linkedDevice } from '../utilities/linked_device';
@@ -148,8 +150,9 @@ function sessionTestGeneric<
         for (let index = 0; index < links.length; index++) {
           const link = links[index];
           console.info(
-            'linking a window with ',
-            users[link - 1].recoveryPassword,
+            `linking a window with "${chalk.green(
+              users[link - 1].recoveryPassword,
+            )}"`,
           );
           const linked = await linkedDevice(users[link - 1].recoveryPassword);
           linkedWindows.push(linked);

tests/automation/types/testing.ts

@@ -126,7 +126,7 @@ export type DataTestId =
   | 'messages-container'
   | 'chooser-new-group'
   | 'new-closed-group-name'
-  | 'next-button'
+  | 'create-group-button'
   | 'link-device'
   | 'group-name-input'
   | 'right-panel-group-name'

tests/automation/utilities/utils.ts

@@ -90,6 +90,16 @@ export async function waitForTextMessage(
   return el;
 }
 
+export async function waitForTextMessages(
+  window: Page,
+  texts: Array<string>,
+  maxWait?: number,
+) {
+  return Promise.all(
+    texts.map(async (t) => waitForTextMessage(window, t, maxWait)),
+  );
+}
+
 export async function waitForControlMessageWithText(
   window: Page,
   text: string,

tests/promise_utils.ts

@@ -1,3 +1,5 @@
+import { Page } from '@playwright/test';
+
 export const sleepFor = async (ms: number, showLog = false) => {
   if (showLog) {
     // eslint-disable-next-line no-console
@@ -7,3 +9,14 @@ export const sleepFor = async (ms: number, showLog = false) => {
     setTimeout(resolve, ms);
   });
 };
+
+export async function doForAll<T>(
+  fn: (window: Page) => Promise<T>,
+  windows: Array<Page>,
+) {
+  return Promise.all(
+    windows.map(async (w) => {
+      return fn(w);
+    }),
+  );
+}