Merge branch 're-enable-screenshots-for-ipad'

mullvad · Jun 27, 2024 · 94c1da4 · 94c1da4
2 parents 69f1462 + bb89790
commit 94c1da4
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/.github/workflows/ios-screenshots-tests.yml b/.github/workflows/ios-screenshots-tests.yml
@@ -20,7 +20,6 @@ jobs:
     env:
       SOURCE_PACKAGES_PATH: .spm
       TEST_ACCOUNT: ${{ secrets.IOS_TEST_ACCOUNT_NUMBER }}
-      PARTNER_API_TOKEN: ${{ secrets.STAGEMOLE_PARTNER_AUTH }}
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3

diff --git a/ios/Configurations/UITests.xcconfig.template b/ios/Configurations/UITests.xcconfig.template
@@ -10,8 +10,7 @@ TEST_DEVICE_IDENTIFIER_UUID =
 // PARTNER_API_TOKEN = 
 
 // Mullvad accounts used by UI tests
-HAS_TIME_ACCOUNT_NUMBER[config=Debug] = 
-HAS_TIME_ACCOUNT_NUMBER[config=Staging] = 
+HAS_TIME_ACCOUNT_NUMBER = 
 
 // Ad serving domain used when testing ad blocking. Note that we are assuming there's an HTTP server running on the host.
 AD_SERVING_DOMAIN = vpnlist.to

diff --git a/ios/MullvadVPNUITests/Pages/Page.swift b/ios/MullvadVPNUITests/Pages/Page.swift
@@ -50,7 +50,8 @@ class Page {
     }
 
     @discardableResult func tapWhereStatusBarShouldBeToScrollToTopMostPosition() -> Self {
-        app.coordinate(withNormalizedOffset: CGVector(dx: 0.5, dy: 0)).tap()
+        // Tapping but not at center x coordinate because on iPad there's an ellipsis button in the center of the status bar
+        app.coordinate(withNormalizedOffset: CGVector(dx: 0.75, dy: 0)).tap()
         return self
     }
 }
diff --git a/ios/Snapfile b/ios/Snapfile
@@ -4,9 +4,9 @@ ios_version '17.2'
 devices([
   "iPhone SE (3rd generation)",
   "iPhone 15 Pro",
-  "iPhone 15 Pro Max"
-  #"iPad Pro (11-inch) (4th generation)",
-  #"iPad Pro (12.9-inch) (6th generation)"
+  "iPhone 15 Pro Max",
+  "iPad Pro (11-inch) (4th generation)",
+  "iPad Pro (12.9-inch) (6th generation)"
 ])
 
 languages([