From 2ddfa19b8ef42c4d8683072438889b482f3f7700 Mon Sep 17 00:00:00 2001
From: Aaron Train <aaron.train@gmail.com>
Date: Tue, 18 Aug 2020 14:21:40 -0400
Subject: [PATCH] Fix #5937: Re-enable more XCUI tests

---
 XCUITests/BookmarkingTests.swift       |  5 +----
 XCUITests/HomePageSettingsUITest.swift | 10 ++++------
 XCUITests/SearchTest.swift             | 12 +++++-------
 3 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/XCUITests/BookmarkingTests.swift b/XCUITests/BookmarkingTests.swift
index 2efacb979c4d..c4959e98f2f0 100644
--- a/XCUITests/BookmarkingTests.swift
+++ b/XCUITests/BookmarkingTests.swift
@@ -136,9 +136,6 @@ class BookmarkingTests: BaseTestCase {
         waitForValueContains(app.textFields["url"], value: url_3)
     }
 
-    // Smoketest
-    // Disabling and modifying this check xcode 11.3 update Issue 5937
-    /*
     func testBookmarksAwesomeBar() {
         navigator.nowAt(BrowserTab)
         navigator.goto(URLBarOpen)
@@ -175,7 +172,7 @@ class BookmarkingTests: BaseTestCase {
         waitForExistence(app.tables["SiteTable"])
         waitForExistence(app.buttons["olx.ro"])
         XCTAssertNotEqual(app.tables["SiteTable"].cells.count, 0)
-    }*/
+    }
 
     func testAddBookmark() {
         addNewBookmark()
diff --git a/XCUITests/HomePageSettingsUITest.swift b/XCUITests/HomePageSettingsUITest.swift
index 797eaee8b76d..1858e539c54a 100644
--- a/XCUITests/HomePageSettingsUITest.swift
+++ b/XCUITests/HomePageSettingsUITest.swift
@@ -120,9 +120,7 @@ class HomePageSettingsUITests: BaseTestCase {
 
         XCTAssertEqual("Enter a webpage", value as! String)
     }*/
-    
-    // Disabled due to xcode 11.3 udpate Issue 5937
-    /*
+
     func testSetFirefoxHomeAsHome() {
         // Start by setting to History since FF Home is default
         navigator.goto(HomeSettings)
@@ -136,7 +134,7 @@ class HomePageSettingsUITests: BaseTestCase {
         navigator.performAction(Action.SelectHomeAsFirefoxHomePage)
         navigator.performAction(Action.GoToHomePage)
         waitForExistence(app.collectionViews.cells["TopSitesCell"])
-    }*/
+    }
 
     func testSetCustomURLAsHome() {
         navigator.goto(HomeSettings)
@@ -150,8 +148,8 @@ class HomePageSettingsUITests: BaseTestCase {
 
         // Workaroud needed after xcode 11.3 update Issue 5937
         // Lets check only that website is open
-        // waitForExistence(app.textFields["url"], timeout: 5)
-        // waitForValueContains(app.textFields["url"], value: "mozilla")
+        waitForExistence(app.textFields["url"], timeout: 5)
+        waitForValueContains(app.textFields["url"], value: "mozilla")
     }
     
     func testTopSitesCustomNumberOfRows() {
diff --git a/XCUITests/SearchTest.swift b/XCUITests/SearchTest.swift
index 731f35aadf0b..6631ffc9781d 100644
--- a/XCUITests/SearchTest.swift
+++ b/XCUITests/SearchTest.swift
@@ -177,13 +177,11 @@ class SearchTests: BaseTestCase {
     func testSearchEngine() {
         // Change to the each search engine and verify the search uses it
         changeSearchEngine(searchEngine: "Bing")
-        // Lets keep only one search engine test, xcode 11.3 update Issue 5937
-        // changeSearchEngine(searchEngine: "DuckDuckGo")
-        // Temporary disabled due to intermittent issue on BB
-        // changeSearchEngine(searchEngine: "Google")
-        // changeSearchEngine(searchEngine: "Twitter")
-        // changeSearchEngine(searchEngine: "Wikipedia")
-        // changeSearchEngine(searchEngine: "Amazon.com")
+        changeSearchEngine(searchEngine: "DuckDuckGo")
+        changeSearchEngine(searchEngine: "Google")
+        changeSearchEngine(searchEngine: "Twitter")
+        changeSearchEngine(searchEngine: "Wikipedia")
+        changeSearchEngine(searchEngine: "Amazon.com")
     }
 
     func testDefaultSearchEngine() {