diff options
| author | Bug Magnet <marco.nikic@mullvad.net> | 2024-06-27 13:41:39 +0200 |
|---|---|---|
| committer | Bug Magnet <marco.nikic@mullvad.net> | 2024-06-27 13:41:39 +0200 |
| commit | 94c1da45bc2562d248f14bb5890bc51b6bd5e965 (patch) | |
| tree | 60654727e22354bec2a9edcd733c30afa8bb6ca7 | |
| parent | 69f146273548fcfd9b75d3b284c78ba4f2dbe3f3 (diff) | |
| parent | bb89790f82b885470b780d914ea80b6cf250a0c5 (diff) | |
| download | mullvadvpn-94c1da45bc2562d248f14bb5890bc51b6bd5e965.tar.xz mullvadvpn-94c1da45bc2562d248f14bb5890bc51b6bd5e965.zip | |
Merge branch 're-enable-screenshots-for-ipad'
| -rw-r--r-- | .github/workflows/ios-screenshots-tests.yml | 1 | ||||
| -rw-r--r-- | ios/Configurations/UITests.xcconfig.template | 3 | ||||
| -rw-r--r-- | ios/MullvadVPNUITests/Pages/Page.swift | 3 | ||||
| -rw-r--r-- | ios/Snapfile | 6 |
4 files changed, 6 insertions, 7 deletions
diff --git a/.github/workflows/ios-screenshots-tests.yml b/.github/workflows/ios-screenshots-tests.yml index d78ca6ef51..04119fdc13 100644 --- 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 index 74fb0355ee..45688d626f 100644 --- 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 index 92a63d8884..92de1dd3b0 100644 --- 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 index bed7cfd3f1..499ccec261 100644 --- 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([ |