diff options
| author | Albin <albin@mullvad.net> | 2024-07-04 11:48:19 +0200 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2024-07-04 11:48:19 +0200 |
| commit | 73bba2cfb78b789241db09ff5e39f638ecfad5ac (patch) | |
| tree | e91b65a9f91d81c353dc30cfe7be9d2eb29dcb7c /android/app/src/androidTest | |
| parent | 6fcf6e0c507a90fa95e9f86bc88060629d7cc674 (diff) | |
| parent | a6d23d483fd16a8be34a6cc24cd8222f9757eef2 (diff) | |
| download | mullvadvpn-73bba2cfb78b789241db09ff5e39f638ecfad5ac.tar.xz mullvadvpn-73bba2cfb78b789241db09ff5e39f638ecfad5ac.zip | |
Merge branch 'only-show-unsupported-version-in-settings-droid-1103'
Diffstat (limited to 'android/app/src/androidTest')
2 files changed, 4 insertions, 48 deletions
diff --git a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreenTest.kt b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreenTest.kt index 98c87114fb..9ba5db81bc 100644 --- a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreenTest.kt +++ b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreenTest.kt @@ -598,49 +598,10 @@ class ConnectScreenTest { } @Test - fun testOutdatedVersionNotification() { - composeExtension.use { - // Arrange - val versionInfo = - VersionInfo( - currentVersion = "1.0", - isSupported = true, - suggestedUpgradeVersion = "1.1" - ) - setContentWithTheme { - ConnectScreen( - state = - ConnectUiState( - location = null, - selectedRelayItemTitle = null, - tunnelState = TunnelState.Connecting(null, null), - inAddress = null, - outAddress = "", - showLocation = false, - deviceName = "", - daysLeftUntilExpiry = null, - inAppNotification = InAppNotification.UpdateAvailable(versionInfo), - isPlayBuild = false - ), - ) - } - - // Assert - onNodeWithText("UPDATE AVAILABLE").assertExists() - onNodeWithText("Install Mullvad VPN (1.1) to stay up to date").assertExists() - } - } - - @Test fun testUnsupportedVersionNotification() { composeExtension.use { // Arrange - val versionInfo = - VersionInfo( - currentVersion = "1.0", - isSupported = false, - suggestedUpgradeVersion = "1.1" - ) + val versionInfo = VersionInfo(currentVersion = "1.0", isSupported = false) setContentWithTheme { ConnectScreen( state = @@ -702,12 +663,7 @@ class ConnectScreenTest { composeExtension.use { // Arrange val mockedClickHandler: () -> Unit = mockk(relaxed = true) - val versionInfo = - VersionInfo( - isSupported = false, - currentVersion = "", - suggestedUpgradeVersion = "1.1" - ) + val versionInfo = VersionInfo(isSupported = false, currentVersion = "") setContentWithTheme { ConnectScreen( onUpdateVersionClick = mockedClickHandler, diff --git a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/SettingsScreenTest.kt b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/SettingsScreenTest.kt index afa144f405..469fb629a4 100644 --- a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/SettingsScreenTest.kt +++ b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/SettingsScreenTest.kt @@ -31,7 +31,7 @@ class SettingsScreenTest { SettingsUiState( appVersion = "", isLoggedIn = true, - isUpdateAvailable = true, + isSupportedVersion = true, isPlayBuild = false ), ) @@ -54,7 +54,7 @@ class SettingsScreenTest { SettingsUiState( appVersion = "", isLoggedIn = false, - isUpdateAvailable = true, + isSupportedVersion = true, isPlayBuild = false ), ) |