From 5b14d3124514587130f568e1f0ce89a5bb3200a3 Mon Sep 17 00:00:00 2001
From: Joseph Baylon <joseph.baylon@mattermost.com>
Date: Fri, 26 Aug 2022 09:28:14 -0700
Subject: [PATCH] Fixed/stabilized tests; added new known issue tickets

---
 detox/e2e/support/ui/screen/server_list.ts           | 3 ++-
 detox/e2e/test/autocomplete/at_mention.e2e.ts        | 2 +-
 detox/e2e/test/autocomplete/create_channel.e2e.ts    | 2 +-
 detox/e2e/test/server_login/connect_to_server.e2e.ts | 2 +-
 detox/e2e/test/threads/global_threads.e2e.ts         | 4 ++--
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/detox/e2e/support/ui/screen/server_list.ts b/detox/e2e/support/ui/screen/server_list.ts
index cb32cbbb4..a3db0a096 100644
--- a/detox/e2e/support/ui/screen/server_list.ts
+++ b/detox/e2e/support/ui/screen/server_list.ts
@@ -2,7 +2,7 @@
 // See LICENSE.txt for license information.
 
 import {ChannelListScreen} from '@support/ui/screen';
-import {timeouts} from '@support/utils';
+import {timeouts, wait} from '@support/utils';
 import {expect} from 'detox';
 
 class ServerListScreen {
@@ -61,6 +61,7 @@ class ServerListScreen {
         await ChannelListScreen.serverIcon.tap();
 
         // # Close tip overlay
+        await wait(timeouts.FOUR_SEC);
         await this.serverListScreen.tap({x: 5, y: 10});
 
         return this.toBeVisible();
diff --git a/detox/e2e/test/autocomplete/at_mention.e2e.ts b/detox/e2e/test/autocomplete/at_mention.e2e.ts
index 558812c92..0ec4581ab 100644
--- a/detox/e2e/test/autocomplete/at_mention.e2e.ts
+++ b/detox/e2e/test/autocomplete/at_mention.e2e.ts
@@ -232,7 +232,7 @@ describe('Autocomplete - At-Mention', () => {
         await expect(userAtMentionAutocomplete).not.toBeVisible();
     });
 
-    it('MM-T4878_11 - should be able to select at-mention multiple times', async () => {
+    it('MM-T4878_11 - should be able to select at-mention multiple times -- KNOWN ISSUE: MM-46648', async () => {
         // # Type in "@" to activate at-mention autocomplete
         await expect(Autocomplete.sectionAtMentionList).not.toBeVisible();
         await ChannelScreen.postInput.typeText('@');
diff --git a/detox/e2e/test/autocomplete/create_channel.e2e.ts b/detox/e2e/test/autocomplete/create_channel.e2e.ts
index 661c257dd..7c868c739 100644
--- a/detox/e2e/test/autocomplete/create_channel.e2e.ts
+++ b/detox/e2e/test/autocomplete/create_channel.e2e.ts
@@ -61,7 +61,7 @@ describe('Autocomplete - Create Channel', () => {
         await expect(Autocomplete.sectionAtMentionList).toBeVisible();
     });
 
-    it('MM-T4904_2 - should render channel mention autocomplete in header input', async () => {
+    it('MM-T4904_2 - should render channel mention autocomplete in header input -- KNOWN ISSUE: MM-46650', async () => {
         // * Verify channel mention list is not displayed
         await expect(Autocomplete.sectionChannelMentionList).not.toBeVisible();
 
diff --git a/detox/e2e/test/server_login/connect_to_server.e2e.ts b/detox/e2e/test/server_login/connect_to_server.e2e.ts
index 755279b4c..b7b7970ea 100644
--- a/detox/e2e/test/server_login/connect_to_server.e2e.ts
+++ b/detox/e2e/test/server_login/connect_to_server.e2e.ts
@@ -71,7 +71,7 @@ describe('Server Login - Connect to Server', () => {
         await connectButton.tap();
 
         // * Verify invalid url error
-        await expect(serverUrlInputError).toHaveText(`"http://${invalidServerUrl}" is not a valid API base URL`);
+        await expect(serverUrlInputError).toHaveText('Can’t find this server. Check spelling and URL format.');
     });
 
     it('MM-T4676_4 - should show connection error on invalid ssl or invalid host', async () => {
diff --git a/detox/e2e/test/threads/global_threads.e2e.ts b/detox/e2e/test/threads/global_threads.e2e.ts
index 9fedba46b..5b3460cf8 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.getThreadItemFooterUnreadReplies(parentPost.id)).toHaveText('1 new reply');
+        await expect(GlobalThreadsScreen.getThreadItemFooterReplyCount(parentPost.id)).toHaveText('1 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.getThreadItemFooterUnreadReplies(parentPost.id)).toHaveText('1 new reply');
+        await expect(GlobalThreadsScreen.getThreadItemFooterReplyCount(parentPost.id)).toHaveText('1 reply');
 
         // # Tap on the thread
         await GlobalThreadsScreen.getThreadItem(parentPost.id).tap();