summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJonatan Rhodin <jonatan.rhodin@mullvad.net>2024-01-23 12:55:07 +0100
committerJonatan Rhodin <jonatan.rhodin@mullvad.net>2024-01-25 17:10:20 +0100
commit9cfecc933e8bbbf0d2dd9c4f9d2ebe769fd00944 (patch)
tree6dcf0964089c04e136ad4aa2b4b9a7e8dd625d4c
parent237680ee0aa42c0cd31679779796645c6f328a4f (diff)
downloadmullvadvpn-9cfecc933e8bbbf0d2dd9c4f9d2ebe769fd00944.tar.xz
mullvadvpn-9cfecc933e8bbbf0d2dd9c4f9d2ebe769fd00944.zip
Unify ensure login assertion
-rw-r--r--android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/LoginMockApiTest.kt2
-rw-r--r--android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/LogoutMockApiTest.kt2
-rw-r--r--android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/TooManyDevicesMockApiTest.kt2
3 files changed, 3 insertions, 3 deletions
diff --git a/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/LoginMockApiTest.kt b/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/LoginMockApiTest.kt
index 75925a08d5..0dcbc308dc 100644
--- a/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/LoginMockApiTest.kt
+++ b/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/LoginMockApiTest.kt
@@ -62,7 +62,7 @@ class LoginMockApiTest : MockApiTest() {
app.attemptLogin(validAccountToken)
// Assert
- device.findObjectWithTimeout(By.text("UNSECURED CONNECTION"))
+ app.ensureLoggedIn()
}
@Test
diff --git a/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/LogoutMockApiTest.kt b/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/LogoutMockApiTest.kt
index 1fd266c5d6..667515636a 100644
--- a/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/LogoutMockApiTest.kt
+++ b/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/LogoutMockApiTest.kt
@@ -32,7 +32,7 @@ class LogoutMockApiTest : MockApiTest() {
device.dismissChangelogDialogIfShown()
app.waitForLoginPrompt()
app.attemptLogin(validAccountToken)
- device.findObjectWithTimeout(By.text("UNSECURED CONNECTION"))
+ app.ensureLoggedIn()
app.clickAccountCog()
app.clickActionButtonByText("Log out")
diff --git a/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/TooManyDevicesMockApiTest.kt b/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/TooManyDevicesMockApiTest.kt
index b4963b5272..83354dd347 100644
--- a/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/TooManyDevicesMockApiTest.kt
+++ b/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/TooManyDevicesMockApiTest.kt
@@ -62,6 +62,6 @@ class TooManyDevicesMockApiTest : MockApiTest() {
app.clickActionButtonByText("Continue with login")
// Assert that we are logged in
- device.findObjectWithTimeout(By.text("UNSECURED CONNECTION"))
+ app.ensureLoggedIn()
}
}