From dc1bc147e7ef835860c22aa1d7acae4ce75cdbd5 Mon Sep 17 00:00:00 2001 From: Joseph Baylon Date: Mon, 1 Aug 2022 14:13:57 -0700 Subject: [PATCH] Detox/E2E: Fix global threads and unarchive channel tests --- detox/e2e/support/ui/component/alert.ts | 4 ++-- detox/e2e/test/threads/global_threads.e2e.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/detox/e2e/support/ui/component/alert.ts b/detox/e2e/support/ui/component/alert.ts index 7aae763b7a..810a748e90 100644 --- a/detox/e2e/support/ui/component/alert.ts +++ b/detox/e2e/support/ui/component/alert.ts @@ -32,10 +32,10 @@ class Alert { leaveButton = isAndroid() ? element(by.text('LEAVE')) : element(by.label('Leave')).atIndex(0); logoutButton = isAndroid() ? element(by.text('LOG OUT')) : element(by.label('Log out')).atIndex(1); markReadButton = isAndroid() ? element(by.text('MARK READ')) : element(by.label('Mark read')).atIndex(1); - noButton = isAndroid() ? element(by.text('NO')) : element(by.label('No')).atIndex(1); + noButton = isAndroid() ? element(by.text('NO')) : element(by.label('No')).atIndex(0); okButton = isAndroid() ? element(by.text('OK')) : element(by.label('OK')).atIndex(1); removeButton = isAndroid() ? element(by.text('REMOVE')) : element(by.label('Remove')).atIndex(1); - yesButton = isAndroid() ? element(by.text('YES')) : element(by.label('Yes')).atIndex(1); + yesButton = isAndroid() ? element(by.text('YES')) : element(by.label('Yes')).atIndex(0); } const alert = new Alert(); diff --git a/detox/e2e/test/threads/global_threads.e2e.ts b/detox/e2e/test/threads/global_threads.e2e.ts index 5b3460cf87..9fedba46b9 100644 --- a/detox/e2e/test/threads/global_threads.e2e.ts +++ b/detox/e2e/test/threads/global_threads.e2e.ts @@ -93,7 +93,7 @@ describe('Threads - Global Threads', () => { await expect(GlobalThreadsScreen.getThreadItem(parentPost.id)).toBeVisible(); await expect(GlobalThreadsScreen.getThreadItemThreadStarterUserDisplayName(parentPost.id)).toHaveText(testUser.username); await expect(GlobalThreadsScreen.getThreadItemThreadStarterChannelDisplayName(parentPost.id)).toHaveText(testChannel.display_name.toUpperCase()); - await expect(GlobalThreadsScreen.getThreadItemFooterReplyCount(parentPost.id)).toHaveText('1 reply'); + await expect(GlobalThreadsScreen.getThreadItemFooterUnreadReplies(parentPost.id)).toHaveText('1 new reply'); // # Tap on the thread await GlobalThreadsScreen.getThreadItem(parentPost.id).tap(); @@ -161,7 +161,7 @@ describe('Threads - Global Threads', () => { await expect(GlobalThreadsScreen.getThreadItem(parentPost.id)).toBeVisible(); await expect(GlobalThreadsScreen.getThreadItemThreadStarterUserDisplayName(parentPost.id)).toHaveText('sysadmin'); await expect(GlobalThreadsScreen.getThreadItemThreadStarterChannelDisplayName(parentPost.id)).toHaveText(testChannel.display_name.toUpperCase()); - await expect(GlobalThreadsScreen.getThreadItemFooterReplyCount(parentPost.id)).toHaveText('1 reply'); + await expect(GlobalThreadsScreen.getThreadItemFooterUnreadReplies(parentPost.id)).toHaveText('1 new reply'); // # Tap on the thread await GlobalThreadsScreen.getThreadItem(parentPost.id).tap();