diff options
| author | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2024-02-06 14:32:32 +0100 |
|---|---|---|
| committer | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2024-02-06 14:32:32 +0100 |
| commit | 48c023ea883be51aedd0cc3eccac2d4fec77ab2c (patch) | |
| tree | c06dd0e68406d1ec30e13c3ed5bd5d797ad09090 /android/test | |
| parent | f42dcb304d1571c22570bc5a7f2e59199e7b744d (diff) | |
| parent | 16e3bfbb2d380c42efff94902f79b9eff6ecacc8 (diff) | |
| download | mullvadvpn-48c023ea883be51aedd0cc3eccac2d4fec77ab2c.tar.xz mullvadvpn-48c023ea883be51aedd0cc3eccac2d4fec77ab2c.zip | |
Merge branch 'compose-1-6-0'
Diffstat (limited to 'android/test')
3 files changed, 5 insertions, 6 deletions
diff --git a/android/test/mockapi/build.gradle.kts b/android/test/mockapi/build.gradle.kts index 5c88d90d82..10fd4ca99d 100644 --- a/android/test/mockapi/build.gradle.kts +++ b/android/test/mockapi/build.gradle.kts @@ -70,7 +70,6 @@ configure<org.owasp.dependencycheck.gradle.extension.DependencyCheckExtension> { dependencies { implementation(project(Projects.testCommon)) - implementation(project(Dependencies.Mullvad.commonLib)) implementation(project(Dependencies.Mullvad.endpointLib)) implementation(Dependencies.AndroidX.testCore) diff --git a/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/AccountHistoryMockApiTest.kt b/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/AccountHistoryMockApiTest.kt index f43eadf5c0..9d1727cad7 100644 --- a/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/AccountHistoryMockApiTest.kt +++ b/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/AccountHistoryMockApiTest.kt @@ -2,7 +2,6 @@ package net.mullvad.mullvadvpn.test.mockapi import androidx.test.uiautomator.By import net.mullvad.mullvadvpn.compose.test.LOGIN_INPUT_TEST_TAG -import net.mullvad.mullvadvpn.lib.common.util.groupWithSpaces import net.mullvad.mullvadvpn.test.common.extension.clickAgreeOnPrivacyDisclaimer import net.mullvad.mullvadvpn.test.common.extension.clickAllowOnNotificationPermissionPromptIfApiLevel33AndAbove import net.mullvad.mullvadvpn.test.common.extension.dismissChangelogDialogIfShown @@ -40,10 +39,11 @@ class AccountHistoryMockApiTest : MockApiTest() { device.findObjectWithTimeout(By.res(LOGIN_INPUT_TEST_TAG)).click() // Assert - assertNotNull(device.findObjectWithTimeout(By.text(validAccountToken.groupWithSpaces()))) + val expectedResult = "1234 1234 1234 1234" + assertNotNull(device.findObjectWithTimeout(By.text(expectedResult))) // Try to login with the same account again - device.findObjectWithTimeout(By.text(validAccountToken.groupWithSpaces())).click() + device.findObjectWithTimeout(By.text(expectedResult)).click() app.ensureLoggedIn() } } 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 b0ad767e31..538a111096 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 @@ -1,6 +1,5 @@ package net.mullvad.mullvadvpn.test.mockapi -import net.mullvad.mullvadvpn.lib.common.util.groupWithSpaces import net.mullvad.mullvadvpn.test.common.extension.clickAgreeOnPrivacyDisclaimer import net.mullvad.mullvadvpn.test.common.extension.clickAllowOnNotificationPermissionPromptIfApiLevel33AndAbove import net.mullvad.mullvadvpn.test.common.extension.dismissChangelogDialogIfShown @@ -27,7 +26,8 @@ class CreateAccountMockApiTest : MockApiTest() { app.attemptCreateAccount() // Assert - app.ensureAccountCreated(createdAccountToken.groupWithSpaces()) + val expectedResult = "1234 1234 1234 1234" + app.ensureAccountCreated(expectedResult) } @Test |