Modified test flow to avoid race condition

mullvad · Feb 2, 2024 · 18abea9 · 18abea9
1 parent 0e9adc3
commit 18abea9
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 11 deletions.
diff --git a/ios/MullvadVPNUITests/Pages/Page.swift b/ios/MullvadVPNUITests/Pages/Page.swift
@@ -30,4 +30,10 @@ class Page {
         app.typeText(text)
         return self
     }
+
+    /// Fast swipe down action to dismiss a modal view. Will swipe on the middle of the screen.
+    @discardableResult func swipeDownToDismissModal() -> Self {
+        app.swipeDown(velocity: .fast)
+        return self
+    }
 }
diff --git a/ios/MullvadVPNUITests/RelayTests.swift b/ios/MullvadVPNUITests/RelayTests.swift
@@ -11,6 +11,16 @@ import XCTest
 
 class RelayTests: LoggedInWithTimeUITestCase {
     func testAdBlockingViaDNS() throws {
+        HeaderBar(app)
+            .tapSettingsButton()
+
+        SettingsPage(app)
+            .tapVPNSettingsCell()
+            .tapDNSSettingsCell()
+            .tapDNSContentBlockingHeaderExpandButton()
+            .tapBlockAdsSwitch()
+            .swipeDownToDismissModal()
+
         TunnelControlPage(app)
             .tapSelectLocationButton()
 
@@ -23,17 +33,6 @@ class RelayTests: LoggedInWithTimeUITestCase {
 
         TunnelControlPage(app) // Make sure we're taken back to tunnel control page again
 
-        verifyCanReachAdServingDomain()
-
-        HeaderBar(app)
-            .tapSettingsButton()
-
-        SettingsPage(app)
-            .tapVPNSettingsCell()
-            .tapDNSSettingsCell()
-            .tapDNSContentBlockingHeaderExpandButton()
-            .tapBlockAdsSwitch()
-
         verifyCannotReachAdServingDomain()
     }