Merge branch 'offer-to-store-the-account-with-credentialmanager-on-droid-1854'

2 files changed, 13 insertions, 0 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 2b9b008ad0..c940f9bfba 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
@@ -152,4 +152,15 @@ class AppInteractor(
         device.findObjectWithTimeout(By.desc("Remove")).click()
         clickActionButtonByText("Yes, log out device")
     }
+
+    fun dismissStorePasswordPromptIfShown() {
+        try {
+            device.waitForIdle()
+            val selector = By.textContains("password")
+            device.wait(Until.hasObject(selector), DEFAULT_TIMEOUT)
+            device.pressBack()
+        } catch (e: IllegalArgumentException) {
+            // This is OK since it means the password prompt wasn't shown.
+        }
+    }
 }
diff --git a/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/CreateAccountMockApiTest.kt b/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/CreateAccountMockApiTest.kt
index 05418cb34b..9b5cf85b95 100644
--- a/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/CreateAccountMockApiTest.kt
+++ b/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/CreateAccountMockApiTest.kt
@@ -24,6 +24,8 @@ class CreateAccountMockApiTest : MockApiTest() {
         app.waitForLoginPrompt()
         app.attemptCreateAccount()
 
+        app.dismissStorePasswordPromptIfShown()
+
         // Assert
         val expectedResult = "1234 1234 1234 1234"
         app.ensureAccountCreated(expectedResult)