Fix flaky device management test

The device mangement test would fail because it expect the device to be
removed however it was in a loading state while API request was being
made. This commit allows it to be visible intiailly (loading) and then
expects it to be removed.

2 files changed, 22 insertions, 0 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 cb186463cd..aa993025f5 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
@@ -9,6 +9,7 @@ import androidx.test.uiautomator.UiObject2
 import androidx.test.uiautomator.UiObject2Condition
 import androidx.test.uiautomator.Until
 import co.touchlab.kermit.Logger
+import java.lang.Thread.sleep
 import java.util.regex.Pattern
 import net.mullvad.mullvadvpn.test.common.constant.DEFAULT_TIMEOUT
 import net.mullvad.mullvadvpn.test.common.constant.LONG_TIMEOUT
@@ -40,6 +41,22 @@ fun UiDevice.findObjectWithTimeout(
     return foundObject
 }
 
+fun UiDevice.expectObjectToDisappearWithTimeout(
+    selector: BySelector,
+    timeout: Long = DEFAULT_TIMEOUT,
+) {
+    val sleepInterval = 100L
+    val startTime = System.currentTimeMillis()
+
+    while (null != findObject(selector)) {
+        val elapsedTime = System.currentTimeMillis() - startTime
+        if (elapsedTime > timeout) {
+            error("Object is still visible after timeout")
+        }
+        sleep(sleepInterval)
+    }
+}
+
 fun UiDevice.clickObjectAwaitCondition(
     selector: BySelector,
     condition: UiObject2Condition<Boolean>,
diff --git a/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/page/AccountPage.kt b/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/page/AccountPage.kt
index db4a963648..67183b68f6 100644
--- a/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/page/AccountPage.kt
+++ b/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/page/AccountPage.kt
@@ -1,6 +1,7 @@
 package net.mullvad.mullvadvpn.test.common.page
 
 import androidx.test.uiautomator.By
+import net.mullvad.mullvadvpn.lib.ui.tag.MANAGE_DEVICES_BUTTON_TEST_TAG
 import net.mullvad.mullvadvpn.test.common.extension.findObjectWithTimeout
 
 class AccountPage internal constructor() : Page() {
@@ -10,6 +11,10 @@ class AccountPage internal constructor() : Page() {
         uiDevice.findObjectWithTimeout(By.text("Account"))
     }
 
+    fun clickManageDevices() {
+        uiDevice.findObject(By.res(MANAGE_DEVICES_BUTTON_TEST_TAG)).click()
+    }
+
     fun clickLogOut() {
         uiDevice.findObjectWithTimeout(logOutSelector).click()
     }