screenobject(update): improving chat message locators

Satellite-im · Mar 1, 2024 · 5805b1a · 5805b1a
1 parent e4c16a6
commit 5805b1a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 16 deletions.
diff --git a/tests/screenobjects/chats/MessageLocal.ts b/tests/screenobjects/chats/MessageLocal.ts
@@ -243,16 +243,12 @@ export default class MessageLocal extends UplinkMainScreen {
     await driver.waitUntil(
       async () => {
         if (currentDriver === MACOS_DRIVER) {
-          return await $(
-            '-ios class chain:**/XCUIElementTypeGroup[`label BEGINSWITH "message-text"`]/**/XCUIElementTypeStaticText[`value BEGINSWITH "' +
-              expectedMessage +
-              '"`]',
-          ).waitForExist({ reverse: true });
+          return await $(`~message-text-${expectedMessage}`).waitForExist({
+            reverse: true,
+          });
         } else if (currentDriver === WINDOWS_DRIVER) {
           return await $(
-            '//Group[contains(@Name, "message-text")]//Text[contains(@Name, "' +
-              expectedMessage +
-              '")]',
+            `[name="message-text-${expectedMessage}"]`,
           ).waitForExist({ reverse: true });
         }
       },

diff --git a/tests/screenobjects/chats/MessageRemote.ts b/tests/screenobjects/chats/MessageRemote.ts
@@ -321,16 +321,12 @@ export default class MessageRemote extends UplinkMainScreen {
     await driver.waitUntil(
       async () => {
         if (currentDriver === MACOS_DRIVER) {
-          return await $(
-            '-ios class chain:**/XCUIElementTypeGroup[`label BEGINSWITH "message-text"`]/**/XCUIElementTypeStaticText[`value BEGINSWITH "' +
-              expectedMessage +
-              '"`]',
-          ).waitForExist({ reverse: true });
+          return await $(`~message-text-${expectedMessage}`).waitForExist({
+            reverse: true,
+          });
         } else if (currentDriver === WINDOWS_DRIVER) {
           return await $(
-            '//Group[contains(@Name, "message-text")]//Text[contains(@Name, "' +
-              expectedMessage +
-              '")]',
+            `[name="message-text-${expectedMessage}"]`,
           ).waitForExist({ reverse: true });
         }
       },