diff options
Diffstat (limited to 'android/test/common/src')
2 files changed, 5 insertions, 2 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 34690022c9..ea9b761ea1 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 @@ -96,7 +96,7 @@ class AppInteractor( } fun extractInIpv4Address(): String { - device.findObjectWithTimeout(By.res("location_info_test_tag")).click() + device.findObjectWithTimeout(By.res("connect_card_header_test_tag")).click() val inString = device .findObjectWithTimeout( @@ -105,7 +105,7 @@ class AppInteractor( ) .text - val extractedIpAddress = inString.split(" ")[1].split(":")[0] + val extractedIpAddress = inString.split(" ")[0].split(":")[0] return extractedIpAddress } diff --git a/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/rule/ForgetAllVpnAppsInSettingsTestRule.kt b/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/rule/ForgetAllVpnAppsInSettingsTestRule.kt index c96718da61..2a4a4dfeb1 100644 --- a/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/rule/ForgetAllVpnAppsInSettingsTestRule.kt +++ b/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/rule/ForgetAllVpnAppsInSettingsTestRule.kt @@ -45,6 +45,8 @@ class ForgetAllVpnAppsInSettingsTestRule : BeforeTestExecutionCallback { device .findObjectWithTimeout(By.text(DELETE_VPN_CONFIRM_BUTTON_TEXT_REGEXP)) .click() + } else if (device.hasObjectWithTimeout(By.text(FORGET_VPN_BUTTON_TEXT))) { + device.findObjectWithTimeout(By.text(FORGET_VPN_BUTTON_TEXT)).click() } else { fail("Unable to find forget or delete button") } @@ -60,6 +62,7 @@ class ForgetAllVpnAppsInSettingsTestRule : BeforeTestExecutionCallback { private val HARDCODED_VPN_PROFILE_NAMES = listOf("VPN by Google") private const val FORGET_VPN_VPN_BUTTON_TEXT = "Forget VPN" + private const val FORGET_VPN_BUTTON_TEXT = "Forget" // Legacy VPN private const val DELETE_VPN_PROFILE_TEXT = "Delete VPN profile" private const val FORGET_VPN_VPN_CONFIRM_BUTTON_TEXT = "Forget" // Samsung S22 shows "Delete" |