diff options
| author | Niklas Berglund <niklas.berglund@gmail.com> | 2024-08-23 11:41:39 +0200 |
|---|---|---|
| committer | David Göransson <david.goransson@mullvad.net> | 2024-08-27 17:09:50 +0200 |
| commit | 2e280c73a2f1e599a9651ad96dbca04713d56a75 (patch) | |
| tree | 38fd3f3f8fbb0e1ae1b9883389135bd2c8f518e6 /android/test | |
| parent | 0e93fd3cd3150c846035e1dd3ebf2d84d218a8db (diff) | |
| download | mullvadvpn-2e280c73a2f1e599a9651ad96dbca04713d56a75.tar.xz mullvadvpn-2e280c73a2f1e599a9651ad96dbca04713d56a75.zip | |
Handle alternative wording for deleting VPN profile
Diffstat (limited to 'android/test')
| -rw-r--r-- | android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/rule/ForgetAllVpnAppsInSettingsTestRule.kt | 12 |
1 files changed, 10 insertions, 2 deletions
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 9457b7862e..2bb751c5d2 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 @@ -23,14 +23,22 @@ class ForgetAllVpnAppsInSettingsTestRule : BeforeTestExecutionCallback { device.findObjects(By.res(SETTINGS_PACKAGE, VPN_SETTINGS_BUTTON_ID)) vpnSettingsButtons.forEach { button -> button.click() - device.findObjectWithTimeout(By.text(FORGET_VPN_VPN_BUTTON_TEXT)).click() - device.findObjectByCaseInsensitiveText(FORGET_VPN_VPN_CONFIRM_BUTTON_TEXT).click() + + try { + device.findObjectWithTimeout(By.text(FORGET_VPN_VPN_BUTTON_TEXT)).click() + device.findObjectByCaseInsensitiveText(FORGET_VPN_VPN_CONFIRM_BUTTON_TEXT).click() + } catch (_: Exception) { + device.findObjectWithTimeout(By.text(DELETE_VPN_PROFILE_TEXT)).click() + device.findObjectWithTimeout(By.text(DELETE_VPN_CONFIRM_BUTTON_TEXT)).click() + } } } companion object { private const val FORGET_VPN_VPN_BUTTON_TEXT = "Forget VPN" + private const val DELETE_VPN_PROFILE_TEXT = "Delete VPN profile" private const val FORGET_VPN_VPN_CONFIRM_BUTTON_TEXT = "Forget" + private const val DELETE_VPN_CONFIRM_BUTTON_TEXT = "DELETE" private const val SETTINGS_PACKAGE = "com.android.settings" private const val VPN_SETTINGS_BUTTON_ID = "settings_button" } |