diff options
| author | David Göransson <david.goransson@mullvad.net> | 2024-07-30 12:33:59 +0200 |
|---|---|---|
| committer | David Göransson <david.goransson@mullvad.net> | 2024-07-30 12:33:59 +0200 |
| commit | 5fa4f9684bd016b602361bd2b4b64ba54890d694 (patch) | |
| tree | 90a718765479878e324cab16e40e8fbfff259c68 /android/app | |
| parent | 5dd533cbc3961d91a9463b563ff357105250ec54 (diff) | |
| parent | ee47d0127b83a62f71376e0aec2c105bcf0b94f4 (diff) | |
| download | mullvadvpn-5fa4f9684bd016b602361bd2b4b64ba54890d694.tar.xz mullvadvpn-5fa4f9684bd016b602361bd2b4b64ba54890d694.zip | |
Merge branch 'bump-dependencies-1'
Diffstat (limited to 'android/app')
| -rw-r--r-- | android/app/build.gradle.kts | 10 | ||||
| -rw-r--r-- | android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/LoginViewModelTest.kt | 1 |
2 files changed, 8 insertions, 3 deletions
diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index b05e604b64..f0c5766647 100644 --- a/android/app/build.gradle.kts +++ b/android/app/build.gradle.kts @@ -243,6 +243,13 @@ android { project.tasks.assemble.dependsOn("ensureValidVersionCode") } +junitPlatform { + instrumentationTests { + version.set(Versions.Android.junit) + includeExtensions.set(true) + } +} + composeCompiler { enableStrongSkippingMode = true } androidComponents { @@ -369,9 +376,6 @@ dependencies { testImplementation(Dependencies.junitParams) // UI test dependencies - debugImplementation(Dependencies.AndroidX.fragmentTestning) - // Fixes: https://github.com/android/android-test/issues/1589 - debugImplementation(Dependencies.AndroidX.testMonitor) debugImplementation(Dependencies.Compose.testManifest) androidTestImplementation(Dependencies.Koin.test) androidTestImplementation(Dependencies.Kotlin.test) diff --git a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/LoginViewModelTest.kt b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/LoginViewModelTest.kt index c0bf5a135d..33eb3bdc3c 100644 --- a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/LoginViewModelTest.kt +++ b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/LoginViewModelTest.kt @@ -148,6 +148,7 @@ class LoginViewModelTest { uiStates.skipDefaultItem() loginViewModel.login(DUMMY_ACCOUNT_NUMBER.value) assertEquals(Loading.LoggingIn, uiStates.awaitItem().loginState) + assertEquals(Idle(null), uiStates.awaitItem().loginState) assertEquals( LoginUiSideEffect.TooManyDevices(DUMMY_ACCOUNT_NUMBER), sideEffects.awaitItem() |