Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove the use of intent provider for request vpn permission #6592

Closed
wants to merge 2 commits into from
Closed

Remove the use of intent provider for request vpn permission #6592

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
60b6485
Remove the use of intent provider for request vpn permission
Pururun Aug 15, 2024
bef3c80
Fix unit tests
Pururun Aug 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Fix unit tests
  • Loading branch information
@Pururun
Pururun committed Sep 9, 2024
commit bef3c80fb397d4736b2902af56ed855b2e389d6d
15 changes: 10 additions & 5 deletions ...advpn/viewmodel/ChangelogViewModelTest.kt → ...dvpn/viewmodel/MullvadAppViewModelTest.kt
View file
Original file line number Diff line number Diff line change
@@ -11,18 +11,20 @@ import kotlin.test.assertEquals
import kotlinx.coroutines.test.runTest
import net.mullvad.mullvadvpn.lib.common.test.TestCoroutineRule
import net.mullvad.mullvadvpn.lib.model.BuildVersion
import net.mullvad.mullvadvpn.lib.shared.ConnectionProxy
import net.mullvad.mullvadvpn.repository.ChangelogRepository
import org.junit.jupiter.api.AfterEach
import org.junit.jupiter.api.BeforeEach
import org.junit.jupiter.api.Test
import org.junit.jupiter.api.extension.ExtendWith

@ExtendWith(TestCoroutineRule::class)
class ChangelogViewModelTest {
class MullvadAppViewModelTest {

@MockK private lateinit var mockedChangelogRepository: ChangelogRepository
@MockK private lateinit var connectionProxy: ConnectionProxy

private lateinit var viewModel: ChangelogViewModel
private lateinit var viewModel: MullvadAppViewModel

private val buildVersion = BuildVersion("1.0", 10)

@@ -43,7 +45,8 @@ class ChangelogViewModelTest {
// Arrange
every { mockedChangelogRepository.getVersionCodeOfMostRecentChangelogShowed() } returns
buildVersion.code
viewModel = ChangelogViewModel(mockedChangelogRepository, buildVersion, false)
viewModel =
MullvadAppViewModel(mockedChangelogRepository, connectionProxy, buildVersion, false)

// If we have the most up to date version code, we should not show the changelog dialog
viewModel.uiSideEffect.test { expectNoEvents() }
@@ -58,7 +61,8 @@ class ChangelogViewModelTest {
version
every { mockedChangelogRepository.getLastVersionChanges() } returns changes

viewModel = ChangelogViewModel(mockedChangelogRepository, buildVersion, false)
viewModel =
MullvadAppViewModel(mockedChangelogRepository, connectionProxy, buildVersion, false)
// Given a new version with a change log we should return it
viewModel.uiSideEffect.test {
assertEquals(awaitItem(), Changelog(version = buildVersion.name, changes = changes))
@@ -71,7 +75,8 @@ class ChangelogViewModelTest {
every { mockedChangelogRepository.getVersionCodeOfMostRecentChangelogShowed() } returns -1
every { mockedChangelogRepository.getLastVersionChanges() } returns emptyList()

viewModel = ChangelogViewModel(mockedChangelogRepository, buildVersion, false)
viewModel =
MullvadAppViewModel(mockedChangelogRepository, connectionProxy, buildVersion, false)
// Given a new version with a change log we should not return it
viewModel.uiSideEffect.test { expectNoEvents() }
}
Loading