chore: tweak long message test

Author: Miki-Session

run/test/specs/group_message_long_text.spec.ts

@@ -34,7 +34,6 @@ async function sendLongMessageGroup(platform: SupportedPlatformsType, testInfo:
   const replyMessage = await bob1.replyToMessage(alice, longText);
   await Promise.all(
     [alice1, charlie1].map(async device => {
-      await device.scrollToBottom();
       await device.waitForTextElementToBePresent(new MessageBody(device, replyMessage));
     })
   );

run/test/specs/locators/conversation.ts

@@ -174,12 +174,22 @@ export class AttachmentsButton extends LocatorsInterface {
   }
 }
 
+// TODO tie this to the message whose status we want to check (similar to EmojiReactsPill)
 export class OutgoingMessageStatusSent extends LocatorsInterface {
   public build() {
-    return {
-      strategy: 'accessibility id',
-      selector: `Message sent status: Sent`,
-    } as const;
+    switch (this.platform) {
+      case 'android':
+        return {
+          strategy: '-android uiautomator',
+          selector:
+            'new UiSelector().resourceId("network.loki.messenger.qa:id/messageStatusTextView").text("Sent")',
+        } as const;
+      case 'ios':
+        return {
+          strategy: 'accessibility id',
+          selector: `Message sent status: Sent`,
+        } as const;
+    }
   }
 }
 

run/test/specs/message_long_text.spec.ts

@@ -2,7 +2,12 @@ import type { TestInfo } from '@playwright/test';
 
 import { longText } from '../../constants';
 import { bothPlatformsItSeparate } from '../../types/sessionIt';
-import { MessageBody } from './locators/conversation';
+import {
+  MessageBody,
+  MessageInput,
+  OutgoingMessageStatusSent,
+  SendButton,
+} from './locators/conversation';
 import { ConversationItem } from './locators/home';
 import { open_Alice1_Bob1_friends } from './state_builder';
 import { sleepFor } from './utils';
@@ -45,22 +50,35 @@ async function sendLongMessageIos(platform: SupportedPlatformsType, testInfo: Te
 }
 
 async function sendLongMessageAndroid(platform: SupportedPlatformsType, testInfo: TestInfo) {
-  // Sending a long text message
-  // Open device and server
   const {
     devices: { alice1, bob1 },
-    prebuilt: { alice },
+    prebuilt: { bob },
   } = await open_Alice1_Bob1_friends({
     platform,
     focusFriendsConvo: true,
     testInfo,
   });
   // Send a long message from User A to User B
   await alice1.sendMessage(longText);
-  // Reply to message (User B to User A)
-  const sentMessage = await bob1.replyToMessage(alice, longText);
-  // Check reply came through on alice1
-  await alice1.waitForTextElementToBePresent(new MessageBody(alice1, sentMessage));
+  // Bob replies
+  await bob1.longPressMessage(longText);
+  await bob1.clickOnByAccessibilityID('Reply to message');
+
+  const replyMessage = `${bob.userName} replied to ${longText}`;
+  await bob1.inputText(replyMessage, new MessageInput(bob1));
+  await bob1.clickOnElementAll(new SendButton(bob1));
+
+  // This is dumb. The CI doesn't scroll to bottom when ran through Github Actions.
+  // If you start the emulators on the CI box yourself the test will pass. I have no idea why.
+  if (process.env.GITHUB_ACTIONS) {
+    await bob1.scrollToBottom();
+  }
+
+  await bob1.waitForTextElementToBePresent({
+    ...new OutgoingMessageStatusSent(bob1).build(),
+    maxWait: 50000,
+  });
+  await alice1.waitForTextElementToBePresent(new MessageBody(alice1, replyMessage));
   // Close app
   await closeApp(alice1, bob1);
 }

run/types/DeviceWrapper.ts

@@ -693,23 +693,25 @@ export class DeviceWrapper {
   }
 
   public async longPressMessage(textToLookFor: string) {
-    const maxRetries = 3;
-    let attempt = 0;
-    let success = false;
+    const truncatedText =
+      textToLookFor.length > 50 ? textToLookFor.substring(0, 50) + '...' : textToLookFor;
 
-    while (attempt < maxRetries && !success) {
-      try {
+    const result = await this.pollUntil(
+      async () => {
+        // Find the message
         const el = await this.waitForTextElementToBePresent({
           ...new MessageBody(this, textToLookFor).build(),
           maxWait: 1_000,
         });
+
         if (!el) {
-          throw new Error(
-            `longPress on message: ${textToLookFor} unsuccessful, couldn't find message`
-          );
+          return { success: false, error: `Couldn't find message: ${truncatedText}` };
         }
 
-        await this.longClick(el, 4000);
+        // Attempt long click
+        await this.longClick(el, 2000);
+
+        // Check if context menu appeared
         const longPressSuccess = await this.waitForTextElementToBePresent({
           strategy: 'accessibility id',
           selector: 'Reply to message',
@@ -718,21 +720,22 @@ export class DeviceWrapper {
 
         if (longPressSuccess) {
           this.log('LongClick successful');
-          success = true; // Exit the loop if successful
-        } else {
-          throw new Error(`longPress on message: ${textToLookFor} unsuccessful`);
-        }
-      } catch (error) {
-        attempt++;
-        if (attempt >= maxRetries) {
-          throw new Error(
-            `Longpress on message: ${textToLookFor} unsuccessful after ${maxRetries} attempts, ${(error as Error).toString()}`
-          );
+          return { success: true, data: el };
         }
-        this.log(`Longpress attempt ${attempt} failed. Retrying...`);
-        await sleepFor(1000);
+
+        return {
+          success: false,
+          error: `Long press didn't show context menu for: ${truncatedText}`,
+        };
+      },
+      {
+        maxWait: 10_000,
+        pollInterval: 1000,
+        onAttempt: attempt => this.log(`Longpress attempt ${attempt}...`),
       }
-    }
+    );
+
+    return result; // or whatever you want to do with it
   }
 
   public async longPressConversation(userName: string) {
@@ -1697,24 +1700,6 @@ export class DeviceWrapper {
     return sentTimestamp;
   }
 
-  public async waitForSentConfirmation() {
-    let pendingStatus = await this.waitForTextElementToBePresent({
-      strategy: 'accessibility id',
-      selector: 'Message sent status: Sending',
-    });
-    const failedStatus = await this.waitForTextElementToBePresent({
-      strategy: 'accessibility id',
-      selector: 'Message sent status: Failed to send',
-    });
-    if (pendingStatus || failedStatus) {
-      await sleepFor(100);
-      pendingStatus = await this.waitForTextElementToBePresent({
-        strategy: 'accessibility id',
-        selector: 'Message sent status: Sending',
-      });
-    }
-  }
-
   public async sendNewMessage(user: Pick<User, 'accountID'>, message: string) {
     // Sender workflow
     // Click on plus button

run/types/testing.ts

@@ -166,6 +166,7 @@ export type UiAutomatorQuery =
   | 'new UiScrollable(new UiSelector().className("android.widget.ScrollView")).scrollIntoView(new UiSelector().resourceId("path-menu-item"))'
   | 'new UiScrollable(new UiSelector().className("android.widget.ScrollView")).scrollIntoView(new UiSelector().text("Select app icon"))'
   | 'new UiScrollable(new UiSelector().className("android.widget.ScrollView")).scrollIntoView(new UiSelector().textStartsWith("Version"))'
+  | 'new UiSelector().resourceId("network.loki.messenger.qa:id/messageStatusTextView").text("Sent")'
   | 'new UiSelector().text("Enter your display name")'
   | `new UiSelector().resourceId("Conversation header name").childSelector(new UiSelector().resourceId("pro-badge-text"))`
   | `new UiSelector().text(${string})`;