fix: change strategy for download, enable, join locators

Author: mikimandoki

run/test/specs/disappearing_link.spec.ts

@@ -12,6 +12,7 @@ import {
   OutgoingMessageStatusSent,
   SendButton,
 } from './locators/conversation';
+import { EnableLinkPreviewsModalButton } from './locators/global';
 import { open_Alice1_Bob1_friends } from './state_builder';
 import { sleepFor } from './utils';
 import { closeApp, SupportedPlatformsType } from './utils/open_app';
@@ -61,7 +62,7 @@ async function disappearingLinkMessage1o1Ios(platform: SupportedPlatformsType, t
         englishStrippedStr('linkPreviewsFirstDescription').toString()
       );
     });
-    await alice1.clickOnByAccessibilityID('Enable');
+    await alice1.clickOnElementAll(new EnableLinkPreviewsModalButton(alice1));
     // On iOS, Appium doesn't paste but type, and the link preview modal interrupts typing the link, the text must be deleted and typed again
     await alice1.deleteText(new MessageInput(alice1));
     await alice1.inputText(testLink, new MessageInput(alice1));
@@ -115,7 +116,7 @@ async function disappearingLinkMessage1o1Android(
         englishStrippedStr('linkPreviewsFirstDescription').toString()
       );
     });
-    await alice1.clickOnByAccessibilityID('Enable');
+    await alice1.clickOnElementAll(new EnableLinkPreviewsModalButton(alice1));
     // Preview takes a while to load
     await sleepFor(5000);
     await alice1.clickOnElementAll(new SendButton(alice1));

run/test/specs/group_disappearing_messages_link.spec.ts

@@ -12,6 +12,7 @@ import {
   OutgoingMessageStatusSent,
   SendButton,
 } from './locators/conversation';
+import { EnableLinkPreviewsModalButton } from './locators/global';
 import { open_Alice1_Bob1_Charlie1_friends_group } from './state_builder';
 import { sleepFor } from './utils';
 import { closeApp, SupportedPlatformsType } from './utils/open_app';
@@ -58,7 +59,7 @@ async function disappearingLinkMessageGroup(platform: SupportedPlatformsType, te
       );
     });
     // Accept link preview modal
-    await alice1.clickOnByAccessibilityID('Enable');
+    await alice1.clickOnElementAll(new EnableLinkPreviewsModalButton(alice1));
     // On iOS, Appium types so the link preview modal interrupts typing the link, must be deleted and typed again
     await alice1.onIOS().deleteText(new MessageInput(alice1));
     await alice1.onIOS().inputText(testLink, new MessageInput(alice1));

run/test/specs/group_message_link_preview.spec.ts

@@ -10,6 +10,7 @@ import {
   OutgoingMessageStatusSent,
   SendButton,
 } from './locators/conversation';
+import { EnableLinkPreviewsModalButton } from './locators/global';
 import { open_Alice1_Bob1_Charlie1_friends_group } from './state_builder';
 import { sleepFor } from './utils';
 import { closeApp, SupportedPlatformsType } from './utils/open_app';
@@ -52,7 +53,7 @@ async function sendLinkGroupiOS(platform: SupportedPlatformsType, testInfo: Test
     englishStrippedStr('linkPreviewsEnable').toString(),
     englishStrippedStr('linkPreviewsFirstDescription').toString()
   );
-  await alice1.clickOnByAccessibilityID('Enable');
+  await alice1.clickOnElementAll(new EnableLinkPreviewsModalButton(alice1));
   // No preview on first send
   await alice1.clickOnElementAll(new SendButton(alice1));
   await alice1.waitForTextElementToBePresent({
@@ -100,7 +101,7 @@ async function sendLinkGroupAndroid(platform: SupportedPlatformsType, testInfo:
     englishStrippedStr('linkPreviewsEnable').toString(),
     englishStrippedStr('linkPreviewsFirstDescription').toString()
   );
-  await alice1.clickOnByAccessibilityID('Enable');
+  await alice1.clickOnElementAll(new EnableLinkPreviewsModalButton(alice1));
   //wait for preview to generate
   await sleepFor(5000);
   // No preview on first send

run/test/specs/locators/global.ts

@@ -54,10 +54,18 @@ export class ContinueButton extends LocatorsInterface {
 
 export class EnableLinkPreviewsModalButton extends LocatorsInterface {
   public build() {
-    return {
-      strategy: 'accessibility id',
-      selector: 'Enable',
-    } as const;
+    switch (this.platform) {
+      case 'android':
+        return {
+          strategy: 'id',
+          selector: 'Enable',
+        } as const;
+      case 'ios':
+        return {
+          strategy: 'accessibility id',
+          selector: 'Enable',
+        } as const;
+    }
   }
 }
 

run/test/specs/locators/index.ts

@@ -253,6 +253,23 @@ export class JoinCommunityButton extends LocatorsInterface {
   }
 }
 
+export class JoinCommunityModalButton extends LocatorsInterface {
+  public build(): StrategyExtractionObj {
+    switch (this.platform) {
+      case 'android':
+        return {
+          strategy: 'id',
+          selector: 'Join',
+        } as const;
+      case 'ios':
+        return {
+          strategy: 'accessibility id',
+          selector: 'Join',
+        };
+    }
+  }
+}
+
 export class CommunityInput extends LocatorsInterface {
   public build(): StrategyExtractionObj {
     switch (this.platform) {
@@ -438,7 +455,7 @@ export class DownloadMediaButton extends LocatorsInterface {
     switch (this.platform) {
       case 'android':
         return {
-          strategy: 'accessibility id',
+          strategy: 'id',
           selector: 'Download',
         };
       case 'ios':

run/test/specs/message_community_invitation.spec.ts

@@ -3,7 +3,7 @@ import type { TestInfo } from '@playwright/test';
 import { englishStrippedStr } from '../../localizer/englishStrippedStr';
 import { bothPlatformsIt } from '../../types/sessionIt';
 import { testCommunityLink, testCommunityName } from './../../constants/community';
-import { InviteContactsMenuItem } from './locators';
+import { InviteContactsMenuItem, JoinCommunityModalButton } from './locators';
 import {
   CommunityInvitation,
   CommunityInviteConfirmButton,
@@ -49,7 +49,7 @@ async function sendCommunityInvitation(platform: SupportedPlatformsType, testInf
       .withArgs({ community_name: testCommunityName })
       .toString()
   );
-  await bob1.clickOnElementAll({ strategy: 'accessibility id', selector: 'Join' });
+  await bob1.clickOnElementAll(new JoinCommunityModalButton(bob1));
   await bob1.navigateBack();
   await bob1.waitForTextElementToBePresent(new ConversationItem(bob1, testCommunityName));
   await closeApp(alice1, bob1);

run/test/specs/message_link_preview.spec.ts

@@ -10,6 +10,7 @@ import {
   OutgoingMessageStatusSent,
   SendButton,
 } from './locators/conversation';
+import { EnableLinkPreviewsModalButton } from './locators/global';
 import { open_Alice1_Bob1_friends } from './state_builder';
 import { sleepFor } from './utils';
 import { closeApp, SupportedPlatformsType } from './utils/open_app';
@@ -45,7 +46,7 @@ async function sendLinkIos(platform: SupportedPlatformsType, testInfo: TestInfo)
     englishStrippedStr('linkPreviewsEnable').toString(),
     englishStrippedStr('linkPreviewsFirstDescription').toString()
   );
-  await alice1.clickOnByAccessibilityID('Enable');
+  await alice1.clickOnElementAll(new EnableLinkPreviewsModalButton(alice1));
   await alice1.clickOnElementAll(new SendButton(alice1));
   await alice1.waitForTextElementToBePresent({
     ...new OutgoingMessageStatusSent(alice1).build(),
@@ -81,10 +82,7 @@ async function sendLinkAndroid(platform: SupportedPlatformsType, testInfo: TestI
     englishStrippedStr('linkPreviewsEnable').toString(),
     englishStrippedStr('linkPreviewsFirstDescription').toString()
   );
-  await alice1.clickOnElementAll({
-    strategy: 'accessibility id',
-    selector: 'Enable',
-  });
+  await alice1.clickOnElementAll(new EnableLinkPreviewsModalButton(alice1));
   //wait for preview to generate
   await sleepFor(5000);
   await alice1.clickOnElementAll(new SendButton(alice1));

run/types/testing.ts

@@ -483,9 +483,11 @@ export type Id =
   | 'Disappearing messages type and time'
   | 'Display name'
   | 'donate-menu-item'
+  | 'Download'
   | 'Download media'
   | 'edit-profile-icon'
   | 'Empty list'
+  | 'Enable'
   | 'enjoy-session-negative-button'
   | 'enjoy-session-positive-button'
   | 'Enter display name'
@@ -503,6 +505,7 @@ export type Id =
   | 'invite-contacts-menu-option'
   | 'Invite button'
   | 'Invite friend button'
+  | 'Join'
   | 'Join community button'
   | 'Last updated timestamp'
   | 'Learn about staking link'