Fix flaky E2E tests

GetStream · Oct 17, 2023 · 05da584 · 05da584
1 parent dd6efd1
commit 05da584
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 19 deletions.
diff --git a/SwiftUIDemoAppUITests/Robots/UserRobot+Asserts.swift b/SwiftUIDemoAppUITests/Robots/UserRobot+Asserts.swift
@@ -227,7 +227,7 @@ extension UserRobot {
 
     @discardableResult
     func assertParticipantsAreVisible(count: Int) -> Self {
-        XCTAssertEqual(count, CallPage.participantView.waitCount(count, timeout: UserRobot.defaultTimeout).count)
+        XCTAssertEqual(count, CallPage.participantView.waitCount(count, timeout: UserRobot.defaultTimeout, exact: true).count)
         return self
     }
 

diff --git a/TestTools/UITests/Safari.swift b/TestTools/UITests/Safari.swift
@@ -26,18 +26,14 @@ struct Safari {
     func open(_ url: URL) -> Self {
         safari.launch()
         _ = safari.wait(for: .runningForeground, timeout: 5)
-        if #available(iOS 16.4, *) {
-            safari.open(url)
-            return self
-        } else {
-            // Type the deeplink and execute it
-            let firstLaunchContinueButton = safari.buttons["Continue"]
-            if firstLaunchContinueButton.exists {
-                firstLaunchContinueButton.tap()
-            }
-
-            return go(to: url)
+
+        // Type the deeplink and execute it
+        let firstLaunchContinueButton = safari.buttons["Continue"]
+        if firstLaunchContinueButton.exists {
+            firstLaunchContinueButton.tap()
         }
+
+        return go(to: url)
     }
 
     @discardableResult
@@ -46,20 +42,23 @@ struct Safari {
         if safari.alerts.count > 0 {
             while safari.alerts.count > 0 {
                 safari.alerts.buttons["Allow"].safeTap()
+                sleep(UInt32(0.5))
             }
         }
         return self
     }
 
     @discardableResult
     func tapOnOpenButton(_ timeout: TimeInterval = 5) -> Self {
-        safari
-            .buttons
-            .matching(NSPredicate(format: "label LIKE 'OPEN' OR label LIKE 'Open'"))
-            .firstMatch
-            .wait(timeout: timeout)
-            .tap()
-
+        let openButton = safari.buttons.matching(NSPredicate(format: "label LIKE 'OPEN' OR label LIKE 'Open'")).firstMatch
+
+        var counter = 0
+        while !openButton.wait(timeout: timeout).exists || counter < 5 {
+            safari.buttons["ReloadButton"].tap()
+            counter += 1
+        }
+
+        openButton.tap()
         return self
     }
 }