From 266b2a1eb01bf07c0bf572cc9cf397190374232f Mon Sep 17 00:00:00 2001 From: wafflesvsfrankie <92288602+burtonemily@users.noreply.github.com> Date: Wed, 20 Nov 2024 15:59:35 +1100 Subject: [PATCH] fix: updating tests based on android point release 1.20.6 --- run/test/specs/group_message_delete.spec.ts | 2 +- run/test/specs/group_message_unsend.spec.ts | 2 +- run/test/specs/group_tests_add_contact.spec.ts | 3 ++- run/test/specs/linked_device_delete_message.spec.ts | 4 ++-- run/test/specs/locators/index.ts | 5 ++--- run/test/specs/message_deletion.spec.ts | 2 +- run/test/specs/message_link_preview.spec.ts | 3 ++- run/test/specs/message_unsend.spec.ts | 2 +- run/test/specs/user_actions_delete_contact.spec.ts | 3 ++- run/test/specs/user_actions_set_nickname.spec.ts | 4 ++-- 10 files changed, 16 insertions(+), 14 deletions(-) diff --git a/run/test/specs/group_message_delete.spec.ts b/run/test/specs/group_message_delete.spec.ts index 852530b9..673c0165 100644 --- a/run/test/specs/group_message_delete.spec.ts +++ b/run/test/specs/group_message_delete.spec.ts @@ -42,7 +42,7 @@ async function deleteMessageGroup(platform: SupportedPlatformsType) { .onAndroid() .checkModalStrings( englishStripped('deleteMessage').withArgs({ count: 1 }).toString(), - englishStripped('deleteMessageConfirm').toString() + englishStripped('deleteMessageConfirm').withArgs({ count: 1 }).toString() ); // Select 'Delete for me' await device1.clickOnElementAll(new DeleteMessageLocally(device1)); diff --git a/run/test/specs/group_message_unsend.spec.ts b/run/test/specs/group_message_unsend.spec.ts index 411d63af..c067dcca 100644 --- a/run/test/specs/group_message_unsend.spec.ts +++ b/run/test/specs/group_message_unsend.spec.ts @@ -42,7 +42,7 @@ async function unsendMessageGroup(platform: SupportedPlatformsType) { await device1.checkModalStrings( englishStripped('deleteMessage').withArgs({ count: 1 }).toString(), - englishStripped('deleteMessageConfirm').toString() + englishStripped('deleteMessageConfirm').withArgs({ count: 1 }).toString() ); // Select 'Delete for me' diff --git a/run/test/specs/group_tests_add_contact.spec.ts b/run/test/specs/group_tests_add_contact.spec.ts index 6b3cec99..9430ef3f 100644 --- a/run/test/specs/group_tests_add_contact.spec.ts +++ b/run/test/specs/group_tests_add_contact.spec.ts @@ -46,7 +46,8 @@ async function addContactToGroup(platform: SupportedPlatformsType) { await device1.clickOnElementAll(new EditGroup(device1)); await sleepFor(1000); // Add contact to group - await device1.clickOnElementAll(new InviteContactsMenuItem(device1)); + await device1.onIOS().clickOnElementAll(new InviteContactsMenuItem(device1)); + await device1.onAndroid().clickOnElementAll(new InviteContactsButton(device1)); // Select new user const addedContact = await device1.clickOnElementAll({ strategy: 'accessibility id', diff --git a/run/test/specs/linked_device_delete_message.spec.ts b/run/test/specs/linked_device_delete_message.spec.ts index 740bcd28..89106748 100644 --- a/run/test/specs/linked_device_delete_message.spec.ts +++ b/run/test/specs/linked_device_delete_message.spec.ts @@ -7,7 +7,7 @@ import { newContact } from './utils/create_contact'; import { linkedDevice } from './utils/link_device'; import { SupportedPlatformsType, closeApp, openAppThreeDevices } from './utils/open_app'; -bothPlatformsIt('Deleted message linked device', 'high', deletedMessageLinkedDevice); +bothPlatformsIt('Delete message linked device', 'high', deletedMessageLinkedDevice); async function deletedMessageLinkedDevice(platform: SupportedPlatformsType) { const { device1, device2, device3 } = await openAppThreeDevices(platform); @@ -34,7 +34,7 @@ async function deletedMessageLinkedDevice(platform: SupportedPlatformsType) { .onAndroid() .checkModalStrings( englishStripped('deleteMessage').withArgs({ count: 1 }).toString(), - englishStripped('deleteMessageConfirm').toString() + englishStripped('deleteMessageConfirm').withArgs({ count: 1 }).toString() ); // Select delete for everyone diff --git a/run/test/specs/locators/index.ts b/run/test/specs/locators/index.ts index 170c3c7b..c70d1e9b 100644 --- a/run/test/specs/locators/index.ts +++ b/run/test/specs/locators/index.ts @@ -296,9 +296,8 @@ export class InviteContactsButton extends LocatorsInterface { switch (this.platform) { case 'android': return { - strategy: 'id', - selector: 'network.loki.messenger:id/title', - text: 'Invite Contacts', + strategy: 'accessibility id', + selector: 'Invite Contacts', }; case 'ios': return { diff --git a/run/test/specs/message_deletion.spec.ts b/run/test/specs/message_deletion.spec.ts index 9c006562..ad79598a 100644 --- a/run/test/specs/message_deletion.spec.ts +++ b/run/test/specs/message_deletion.spec.ts @@ -34,7 +34,7 @@ async function deleteMessage(platform: SupportedPlatformsType) { .onAndroid() .checkModalStrings( englishStripped('deleteMessage').withArgs({ count: 1 }).toString(), - englishStripped('deleteMessageConfirm').toString() + englishStripped('deleteMessageConfirm').withArgs({ count: 1 }).toString() ); // Select 'Delete on this device only' diff --git a/run/test/specs/message_link_preview.spec.ts b/run/test/specs/message_link_preview.spec.ts index d8197d95..65e06f07 100644 --- a/run/test/specs/message_link_preview.spec.ts +++ b/run/test/specs/message_link_preview.spec.ts @@ -80,7 +80,8 @@ async function sendLinkAndroid(platform: SupportedPlatformsType) { strategy: 'accessibility id', selector: 'Enable', }); - // No preview on first send + //wait for preview to generate + await sleepFor(5000); await device1.clickOnByAccessibilityID('Send message button'); await device1.waitForTextElementToBePresent({ strategy: 'accessibility id', diff --git a/run/test/specs/message_unsend.spec.ts b/run/test/specs/message_unsend.spec.ts index 3fd60c3b..dc23e439 100644 --- a/run/test/specs/message_unsend.spec.ts +++ b/run/test/specs/message_unsend.spec.ts @@ -34,7 +34,7 @@ async function unsendMessage(platform: SupportedPlatformsType) { .onAndroid() .checkModalStrings( englishStripped('deleteMessage').withArgs({ count: 1 }).toString(), - englishStripped('deleteMessageConfirm').toString() + englishStripped('deleteMessageConfirm').withArgs({ count: 1 }).toString() ); // Select 'Delete for me and User B' diff --git a/run/test/specs/user_actions_delete_contact.spec.ts b/run/test/specs/user_actions_delete_contact.spec.ts index d4fdc79d..a0d22a20 100644 --- a/run/test/specs/user_actions_delete_contact.spec.ts +++ b/run/test/specs/user_actions_delete_contact.spec.ts @@ -39,7 +39,8 @@ async function deleteContact(platform: SupportedPlatformsType) { await device1.clickOnElementAll({ strategy: 'accessibility id', selector: 'Delete' }); await device1.checkModalStrings( englishStripped('conversationsDelete').toString(), - englishStripped('conversationsDeleteDescription').withArgs({ name: USERNAME.BOB }).toString() + englishStripped('conversationsDeleteDescription').withArgs({ name: USERNAME.BOB }).toString(), + true ); await device1.clickOnElementAll(new DeleteContactModalConfirm(device1)); await Promise.all([ diff --git a/run/test/specs/user_actions_set_nickname.spec.ts b/run/test/specs/user_actions_set_nickname.spec.ts index ea962d29..c55d8b32 100644 --- a/run/test/specs/user_actions_set_nickname.spec.ts +++ b/run/test/specs/user_actions_set_nickname.spec.ts @@ -5,8 +5,8 @@ import { newUser } from './utils/create_account'; import { newContact } from './utils/create_contact'; import { SupportedPlatformsType, closeApp, openAppTwoDevices } from './utils/open_app'; -iosIt('Create nickname', 'high', setNicknameIos); -androidIt('Create nickname', 'high', setNicknameAndroid); +iosIt('Set nickname', 'high', setNicknameIos); +androidIt('Set nickname', 'high', setNicknameAndroid); async function setNicknameIos(platform: SupportedPlatformsType) { const { device1, device2 } = await openAppTwoDevices(platform);