diff options
| author | Albin <albin@mullvad.net> | 2023-01-26 10:01:35 +0100 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2023-01-26 10:01:35 +0100 |
| commit | 4d04748a2e9dfe4d07fe5c24999f8eceabc3cb0d (patch) | |
| tree | b25a0f9f9f43772953e6ef2228ac7cc0ad5f0265 /android/test/common/src/main | |
| parent | 01f0e5f473f82c2434ec3cfb7ba509f8494efbcc (diff) | |
| parent | 4d67f4393492a3f1df46302b70edf4a6ee0f40bf (diff) | |
| download | mullvadvpn-4d04748a2e9dfe4d07fe5c24999f8eceabc3cb0d.tar.xz mullvadvpn-4d04748a2e9dfe4d07fe5c24999f8eceabc3cb0d.zip | |
Merge branch 'run-mockapi-tests-in-gh-actions'
Diffstat (limited to 'android/test/common/src/main')
2 files changed, 8 insertions, 1 deletions
diff --git a/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/constant/TimeoutConstants.kt b/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/constant/TimeoutConstants.kt index 0da1d02aaf..6e4b6fa733 100644 --- a/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/constant/TimeoutConstants.kt +++ b/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/constant/TimeoutConstants.kt @@ -5,4 +5,5 @@ const val CONNECTION_TIMEOUT = 30000L const val DEFAULT_INTERACTION_TIMEOUT = 3000L const val LOGIN_TIMEOUT = 30000L const val LOGIN_FAILURE_TIMEOUT = 60000L +const val LOGIN_PROMPT_TIMEOUT = 30000L const val WEB_TIMEOUT = 30000L 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 1d6e9358a8..d4ddb37fba 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 @@ -10,6 +10,7 @@ import net.mullvad.mullvadvpn.lib.endpoint.CustomApiEndpointConfiguration import net.mullvad.mullvadvpn.lib.endpoint.putApiEndpointConfigurationExtra import net.mullvad.mullvadvpn.test.common.constant.APP_LAUNCH_TIMEOUT import net.mullvad.mullvadvpn.test.common.constant.CONNECTION_TIMEOUT +import net.mullvad.mullvadvpn.test.common.constant.LOGIN_PROMPT_TIMEOUT import net.mullvad.mullvadvpn.test.common.constant.LOGIN_TIMEOUT import net.mullvad.mullvadvpn.test.common.constant.MULLVAD_PACKAGE import net.mullvad.mullvadvpn.test.common.constant.SETTINGS_COG_ID @@ -53,7 +54,6 @@ class AppInteractor( } fun attemptLogin(accountToken: String) { - device.findObjectWithTimeout(By.text("Login")) val loginObject = device.findObjectWithTimeout(By.clazz("android.widget.EditText")) .apply { text = accountToken } loginObject.parent.findObject(By.clazz(ImageButton::class.java)).click() @@ -83,6 +83,12 @@ class AppInteractor( device.findObjectWithTimeout(By.text(text)).click() } + fun waitForLoginPrompt( + timeout: Long = LOGIN_PROMPT_TIMEOUT + ) { + device.findObjectWithTimeout(By.text("Login"), timeout) + } + private fun String.extractIpAddress(): String { return split(" ")[1].split(" ")[0] } |