summaryrefslogtreecommitdiffhomepage
path: root/android/test/common
diff options
context:
space:
mode:
authorsaber safavi <saber.safavi@codic.se>2023-12-29 10:09:30 +0100
committerAlbin <albin@mullvad.net>2024-01-05 10:43:47 +0100
commitd123576eca7f8f2f2b8540c9d94e40fdce47d523 (patch)
treeab716f760877d893f9c974bfe19422630b8a2abb /android/test/common
parentb4e789c36efba733b2f267ffd34d7f6875623f76 (diff)
downloadmullvadvpn-d123576eca7f8f2f2b8540c9d94e40fdce47d523.tar.xz
mullvadvpn-d123576eca7f8f2f2b8540c9d94e40fdce47d523.zip
Fix broken e2e tests for ConnectScreen and WebLink
Diffstat (limited to 'android/test/common')
-rw-r--r--android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/interactor/AppInteractor.kt14
1 files changed, 7 insertions, 7 deletions
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 74bc7703d5..6921e6b362 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
@@ -13,9 +13,6 @@ 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
-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.clickAllowOnNotificationPermissionPromptIfApiLevel33AndAbove
import net.mullvad.mullvadvpn.test.common.extension.findObjectWithTimeout
@@ -78,15 +75,18 @@ class AppInteractor(private val device: UiDevice, private val targetContext: Con
}
fun extractIpAddress(): String {
- device.findObjectWithTimeout(By.res(TUNNEL_INFO_ID)).click()
+ device.findObjectWithTimeout(By.res("location_info_test_tag")).click()
return device
- .findObjectWithTimeout(By.res(TUNNEL_OUT_ADDRESS_ID), CONNECTION_TIMEOUT)
+ .findObjectWithTimeout(
+ By.res("location_info_connection_out_test_tag"),
+ CONNECTION_TIMEOUT
+ )
.text
.extractIpAddress()
}
fun clickSettingsCog() {
- device.findObjectWithTimeout(By.res(SETTINGS_COG_ID)).click()
+ device.findObjectWithTimeout(By.res("top_bar_settings_button")).click()
}
fun clickAccountCog() {
@@ -106,6 +106,6 @@ class AppInteractor(private val device: UiDevice, private val targetContext: Con
}
private fun String.extractIpAddress(): String {
- return split(" ")[1].split(" ")[0]
+ return split(" ")[1].split(" ")[0]
}
}