summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAndrej Mihajlov <and@mullvad.net>2020-02-26 18:39:16 +0100
committerAndrej Mihajlov <and@mullvad.net>2020-02-26 18:39:16 +0100
commitcd500438ab9cd5eb2cd831dc1096722cce912b54 (patch)
tree34d26c78b8307a5a54712c88487fa5c3ed9c4700
parent1d30b8a94d8371dd1485aac2181607cbb10fd7bd (diff)
parent8fe6415436d4c7a908a40a29d3f37af5374a3d97 (diff)
downloadmullvadvpn-cd500438ab9cd5eb2cd831dc1096722cce912b54.tar.xz
mullvadvpn-cd500438ab9cd5eb2cd831dc1096722cce912b54.zip
Merge branch 'fix-screenshots-consent-screen'
-rw-r--r--ios/MullvadVPN/Base.lproj/Main.storyboard1
-rw-r--r--ios/MullvadVPNScreenshots/MullvadVPNScreenshots.swift6
2 files changed, 7 insertions, 0 deletions
diff --git a/ios/MullvadVPN/Base.lproj/Main.storyboard b/ios/MullvadVPN/Base.lproj/Main.storyboard
index 898f50bdff..0cdf172a74 100644
--- a/ios/MullvadVPN/Base.lproj/Main.storyboard
+++ b/ios/MullvadVPN/Base.lproj/Main.storyboard
@@ -974,6 +974,7 @@
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ttw-7B-1MM" customClass="AppButton" customModule="MullvadVPN" customModuleProvider="target">
<rect key="frame" x="16" y="24" width="343" height="22"/>
+ <accessibility key="accessibilityConfiguration" identifier="AgreeButton"/>
<state key="normal" title="Agree and continue" backgroundImage="DefaultButton">
<color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</state>
diff --git a/ios/MullvadVPNScreenshots/MullvadVPNScreenshots.swift b/ios/MullvadVPNScreenshots/MullvadVPNScreenshots.swift
index bc492c5d82..2b64a36364 100644
--- a/ios/MullvadVPNScreenshots/MullvadVPNScreenshots.swift
+++ b/ios/MullvadVPNScreenshots/MullvadVPNScreenshots.swift
@@ -32,6 +32,12 @@ class MullvadVPNScreenshots: XCTestCase {
app.launch()
+ // Dismiss consent screen
+ _ = app.buttons["AgreeButton"].waitForExistence(timeout: 10)
+ app.buttons["AgreeButton"].tap()
+
+ // Wait for Login screen and keyboard
+ _ = app.keyboards.firstMatch.waitForExistence(timeout: 10)
snapshot("Login")
// Enter account token