chore: keep on keeping on

Author: Miki-Session

tests/automation/disappearing_message_checks.spec.ts

@@ -7,6 +7,7 @@ import {
   mediaArray,
   testLink,
 } from './constants/variables';
+import { Conversation, Global } from './locators';
 import { test_Alice_1W_Bob_1W } from './setup/sessionTest';
 import { createContact } from './utilities/create_contact';
 import { joinCommunity } from './utilities/join_community';
@@ -52,7 +53,7 @@ mediaArray.forEach(({ mediaType, path, attachmentType }) => {
       await Promise.all([
         waitForTestIdWithText(
           aliceWindow1,
-          'disappear-control-message',
+          Conversation.disappearingControlMessage.selector,
           englishStrippedStr('disappearingMessagesSetYou')
             .withArgs({
               time: formattedTime,
@@ -62,7 +63,7 @@ mediaArray.forEach(({ mediaType, path, attachmentType }) => {
         ),
         waitForTestIdWithText(
           bobWindow1,
-          'disappear-control-message',
+          Conversation.disappearingControlMessage.selector,
           englishStrippedStr('disappearingMessagesSet')
             .withArgs({
               time: formattedTime,
@@ -110,7 +111,7 @@ test_Alice_1W_Bob_1W(
     await Promise.all([
       waitForTestIdWithText(
         aliceWindow1,
-        'disappear-control-message',
+        Conversation.disappearingControlMessage.selector,
         englishStrippedStr('disappearingMessagesSetYou')
           .withArgs({
             time: formattedTime,
@@ -120,7 +121,7 @@ test_Alice_1W_Bob_1W(
       ),
       waitForTestIdWithText(
         bobWindow1,
-        'disappear-control-message',
+        Conversation.disappearingControlMessage.selector,
         englishStrippedStr('disappearingMessagesSet')
           .withArgs({
             time: formattedTime,
@@ -159,7 +160,7 @@ test_Alice_1W_Bob_1W(
     await Promise.all([
       waitForTestIdWithText(
         aliceWindow1,
-        'disappear-control-message',
+        Conversation.disappearingControlMessage.selector,
         englishStrippedStr('disappearingMessagesSetYou')
           .withArgs({
             time: formattedTime,
@@ -169,7 +170,7 @@ test_Alice_1W_Bob_1W(
       ),
       waitForTestIdWithText(
         bobWindow1,
-        'disappear-control-message',
+        Conversation.disappearingControlMessage.selector,
         englishStrippedStr('disappearingMessagesSet')
           .withArgs({
             time: formattedTime,
@@ -213,7 +214,7 @@ test_Alice_1W_Bob_1W(
     await Promise.all([
       waitForTestIdWithText(
         aliceWindow1,
-        'disappear-control-message',
+        Conversation.disappearingControlMessage.selector,
         englishStrippedStr('disappearingMessagesSetYou')
           .withArgs({
             time: formattedTime,
@@ -223,7 +224,7 @@ test_Alice_1W_Bob_1W(
       ),
       waitForTestIdWithText(
         bobWindow1,
-        'disappear-control-message',
+        Conversation.disappearingControlMessage.selector,
         englishStrippedStr('disappearingMessagesSet')
           .withArgs({
             time: formattedTime,
@@ -243,7 +244,11 @@ test_Alice_1W_Bob_1W(
       'modal-heading',
       englishStrippedStr('membersInvite').toString(),
     );
-    await clickOnTestIdWithText(aliceWindow1, 'contact', bob.userName);
+    await clickOnTestIdWithText(
+      aliceWindow1,
+      Global.contactItem.selector,
+      bob.userName,
+    );
     await clickOnTestIdWithText(aliceWindow1, 'session-confirm-ok-button');
     // For lack of a unique ID we use native Playwright methods
     await aliceWindow1

tests/automation/linked_device_group.spec.ts

@@ -3,6 +3,7 @@ import type { Page } from '@playwright/test';
 import { englishStrippedStr } from '../localization/englishStrippedStr';
 import {
   Conversation,
+  ConversationSettings,
   Global,
   HomeScreen,
   LeftPane,
@@ -95,23 +96,26 @@ test_group_Alice_1W_Bob_1W_Charlie_1W(
     // Does group appear?
     await waitForTestIdWithText(
       aliceWindow2,
-      'module-conversation__user__profile-name',
+      HomeScreen.conversationItemName.selector,
       groupCreated.userName,
     );
     // Check group for members, conversation name and messages
     await clickOnTestIdWithText(
       aliceWindow2,
-      'module-conversation__user__profile-name',
+      HomeScreen.conversationItemName.selector,
       groupCreated.userName,
     );
     // Check header name
     await waitForTestIdWithText(
       aliceWindow2,
-      'header-conversation-name',
+      Conversation.conversationHeader.selector,
       groupCreated.userName,
     );
     // Check for group members
-    await clickOnTestIdWithText(aliceWindow2, 'conversation-options-avatar');
+    await clickOnTestIdWithText(
+      aliceWindow2,
+      Conversation.conversationSettingsIcon.selector,
+    );
     // Check right panel has correct name
     await waitForTestIdWithText(aliceWindow2, 'group-name');
     await clickOnTestIdWithText(aliceWindow2, 'manage-members-menu-option');
@@ -124,11 +128,19 @@ test_group_Alice_1W_Bob_1W_Charlie_1W(
     await Promise.all([
       waitForTestIdWithText(
         aliceWindow2,
-        'contact',
+        Global.contactItem.selector,
         englishStrippedStr('you').toString(),
       ),
-      waitForTestIdWithText(aliceWindow2, 'contact', bob.userName),
-      waitForTestIdWithText(aliceWindow2, 'contact', charlie.userName),
+      waitForTestIdWithText(
+        aliceWindow2,
+        Global.contactItem.selector,
+        bob.userName,
+      ),
+      waitForTestIdWithText(
+        aliceWindow2,
+        Global.contactItem.selector,
+        charlie.userName,
+      ),
     ]);
   },
 );
@@ -194,7 +206,7 @@ test_group_Alice_1W_Bob_1W_Charlie_1W(
     );
     await clickOnTestIdWithText(
       aliceWindow2,
-      Conversation.manageMembersOption.selector,
+      ConversationSettings.manageMembersOption.selector,
     );
     // Check for You, Bob and Charlie
     await Promise.all([
@@ -245,7 +257,7 @@ test_group_Alice_1W_Bob_1W_Charlie_1W(
     );
     await clickOnTestIdWithText(
       restoredWindow,
-      Conversation.manageMembersOption.selector,
+      ConversationSettings.manageMembersOption.selector,
     );
     // Check for You, Bob and Charlie
     await Promise.all([
@@ -300,7 +312,7 @@ test_group_Alice_1W_Bob_1W_Charlie_1W(
     );
     await clickOnTestIdWithText(
       restoredWindow2,
-      Conversation.manageMembersOption.selector,
+      ConversationSettings.manageMembersOption.selector,
     );
     // Check for You, Bob and Charlie
     await Promise.all([

tests/automation/locators/index.ts

@@ -74,10 +74,11 @@ export class Conversation extends Locator {
   static readonly deleteMessageRequestButton = this.testId(
     'delete-message-request',
   );
-  static readonly endVoiceMessageButton = this.testId('end-voice-message');
-  static readonly manageMembersOption = this.testId(
-    'manage-members-menu-option',
+  static readonly disappearingControlMessage = this.testId(
+    'disappear-control-message',
   );
+  static readonly endVoiceMessageButton = this.testId('end-voice-message');
+
   static readonly messageInput = this.testId('message-input-text-area');
   static readonly messageRequestAcceptControlMessage = this.testId(
     'message-request-response-message',
@@ -86,6 +87,15 @@ export class Conversation extends Locator {
   static readonly scrollToBottomButton = this.testId('scroll-to-bottom-button');
 }
 
+export class ConversationSettings extends Locator {
+  static readonly disappearingMessagesOption = this.testId(
+    'disappearing-messages-menu-option',
+  );
+  static readonly manageMembersOption = this.testId(
+    'manage-members-menu-option',
+  );
+}
+
 export class Settings extends Locator {
   // Profile
   static readonly accountId = this.testId('your-account-id');

tests/automation/user_actions.spec.ts

@@ -335,7 +335,11 @@ test_Alice_1W_Bob_1W(
     await clickOnTestIdWithText(bobWindow1, Global.modalCloseButton.selector);
     await sendMessage(aliceWindow1, 'Testing read receipts');
     await clickOnTestIdWithText(bobWindow1, Global.backButton.selector);
-    await clickOnTestIdWithText(bobWindow1, HomeScreen.conversationItemName.selector, alice.userName);
+    await clickOnTestIdWithText(
+      bobWindow1,
+      HomeScreen.conversationItemName.selector,
+      alice.userName,
+    );
     await waitForReadTick(aliceWindow1, 'Testing read receipts');
   },
 );

tests/automation/utilities/set_disappearing_messages.ts

@@ -1,6 +1,7 @@
 import { Page } from '@playwright/test';
 
 import { englishStrippedStr } from '../../localization/englishStrippedStr';
+import { Conversation, ConversationSettings } from '../locators';
 import {
   ConversationType,
   DataTestId,
@@ -12,7 +13,6 @@ import {
   clickOnElement,
   clickOnMatchingText,
   clickOnTestIdWithText,
-  doWhileWithMax,
   formatTimeOption,
   waitForElement,
   waitForTestIdWithText,
@@ -29,30 +29,18 @@ export const setDisappearingMessages = async (
   windowB?: Page,
 ) => {
   const enforcedType: ConversationType = conversationType;
-  await doWhileWithMax(5000, 1000, 'setDisappearingMessages', async () => {
-    try {
-      await clickOnTestIdWithText(
-        windowA,
-        'conversation-options-avatar',
-        undefined,
-        undefined,
-        1000,
-      );
-      await clickOnElement({
-        window: windowA,
-        strategy: 'data-testid',
-        selector: 'disappearing-messages-menu-option',
-        maxWait: 100,
-      });
-      return true;
-    } catch (e) {
-      console.log(
-        'setDisappearingMessages doWhileWithMax action threw:',
-        e.message,
-      );
-
-      return false;
-    }
+  await clickOnTestIdWithText(
+    windowA,
+    Conversation.conversationSettingsIcon.selector,
+    undefined,
+    undefined,
+    5_000,
+  );
+  await clickOnElement({
+    window: windowA,
+    strategy: 'data-testid',
+    selector: ConversationSettings.disappearingMessagesOption.selector,
+    maxWait: 5_000,
   });
 
   if (enforcedType === '1:1') {