summaryrefslogtreecommitdiffhomepage
path: root/android/test/common/src
diff options
context:
space:
mode:
authorsaber safavi <saber.safavi@codic.se>2023-03-22 13:06:48 +0100
committersaber safavi <saber.safavi@codic.se>2023-03-22 13:46:31 +0100
commit277f6677923e7fe32a75516a4af3a76bd3032310 (patch)
tree8eb8dcb5a68642b00f4d213c5ef71a0fd9e386e2 /android/test/common/src
parent25ed28e1c8a0f1bd57909ae381fd408af45ff71c (diff)
downloadmullvadvpn-277f6677923e7fe32a75516a4af3a76bd3032310.tar.xz
mullvadvpn-277f6677923e7fe32a75516a4af3a76bd3032310.zip
Fix broken notification permission prompt test
Diffstat (limited to 'android/test/common/src')
-rw-r--r--android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/extension/UiAutomatorExtensions.kt4
-rw-r--r--android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/interactor/AppInteractor.kt4
2 files changed, 4 insertions, 4 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 19cc5a8b93..b40fcd3bc2 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
@@ -37,10 +37,10 @@ fun UiDevice.clickAgreeOnPrivacyDisclaimer() {
findObjectWithTimeout(By.text("Agree and continue")).click()
}
-fun UiDevice.clickAllowOnNotificationPermissionPromptIfApiLevel31AndAbove(
+fun UiDevice.clickAllowOnNotificationPermissionPromptIfApiLevel33AndAbove(
timeout: Long = DEFAULT_INTERACTION_TIMEOUT
) {
- if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) {
+ if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
// Skipping as notification permissions are not shown.
return
}
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 d5a2e5176b..399b702ddb 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
@@ -17,7 +17,7 @@ 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.clickAllowOnNotificationPermissionPromptIfApiLevel33AndAbove
import net.mullvad.mullvadvpn.test.common.extension.findObjectWithTimeout
class AppInteractor(private val device: UiDevice, private val targetContext: Context) {
@@ -44,7 +44,7 @@ class AppInteractor(private val device: UiDevice, private val targetContext: Con
fun launchAndEnsureLoggedIn(accountToken: String) {
launch()
device.clickAgreeOnPrivacyDisclaimer()
- device.clickAllowOnNotificationPermissionPromptIfApiLevel31AndAbove()
+ device.clickAllowOnNotificationPermissionPromptIfApiLevel33AndAbove()
attemptLogin(accountToken)
ensureLoggedIn()
}