diff options
Diffstat (limited to 'android/test/common')
2 files changed, 6 insertions, 0 deletions
diff --git a/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/extension/UiAutomatorExtensions.kt b/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/extension/UiAutomatorExtensions.kt index cb953b920e..59905d72e2 100644 --- a/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/extension/UiAutomatorExtensions.kt +++ b/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/extension/UiAutomatorExtensions.kt @@ -36,6 +36,10 @@ fun UiDevice.findObjectWithTimeout( } } +fun UiDevice.clickAgreeOnPrivacyDisclaimer() { + findObjectWithTimeout(By.text("Agree and continue")).click() +} + fun UiDevice.clickAllowOnNotificationPermissionPromptIfApiLevel31AndAbove( timeout: Long = DEFAULT_INTERACTION_TIMEOUT ) { diff --git a/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/interactor/AppInteractor.kt b/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/interactor/AppInteractor.kt index d4ddb37fba..d3b2abe7ae 100644 --- a/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/interactor/AppInteractor.kt +++ b/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/interactor/AppInteractor.kt @@ -16,6 +16,7 @@ import net.mullvad.mullvadvpn.test.common.constant.MULLVAD_PACKAGE import net.mullvad.mullvadvpn.test.common.constant.SETTINGS_COG_ID import net.mullvad.mullvadvpn.test.common.constant.TUNNEL_INFO_ID import net.mullvad.mullvadvpn.test.common.constant.TUNNEL_OUT_ADDRESS_ID +import net.mullvad.mullvadvpn.test.common.extension.clickAgreeOnPrivacyDisclaimer import net.mullvad.mullvadvpn.test.common.extension.clickAllowOnNotificationPermissionPromptIfApiLevel31AndAbove import net.mullvad.mullvadvpn.test.common.extension.findObjectWithTimeout @@ -48,6 +49,7 @@ class AppInteractor( fun launchAndEnsureLoggedIn(accountToken: String) { launch() + device.clickAgreeOnPrivacyDisclaimer() device.clickAllowOnNotificationPermissionPromptIfApiLevel31AndAbove() attemptLogin(accountToken) ensureLoggedIn() |