Skip to content

Correctly reset navigation stack #1284

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

Merged
merged 1 commit into from
Jun 17, 2021
Merged

Correctly reset navigation stack #1284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 15 additions & 0 deletions app/src/androidTest/java/com/duckduckgo/app/browser/BrowserTabViewModelTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3248,6 +3248,21 @@ class BrowserTabViewModelTest {
assertCommandIssued<Navigate>()
}

@Test
fun whenSubmittedQueryAndNavigationStateIsNullThenResetHistoryCommandSent() {
whenever(mockOmnibarConverter.convertQueryToUrl("nytimes.com", null)).thenReturn("nytimes.com")
testee.onUserSubmittedQuery("nytimes.com")
assertCommandIssued<Command.ResetHistory>()
}

@Test
fun whenSubmittedQueryAndNavigationStateIsNotNullThenResetHistoryCommandNotSent() {
setupNavigation(isBrowsing = true)
whenever(mockOmnibarConverter.convertQueryToUrl("nytimes.com", null)).thenReturn("nytimes.com")
testee.onUserSubmittedQuery("nytimes.com")
assertCommandNotIssued<Command.ResetHistory>()
}

private suspend fun givenFireButtonPulsing() {
whenever(mockUserStageStore.getUserAppStage()).thenReturn(AppStage.DAX_ONBOARDING)
dismissedCtaDaoChannel.send(listOf(DismissedCta(CtaId.DAX_DIALOG_TRACKERS_FOUND)))
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/duckduckgo/app/browser/BrowserTabViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -619,7 +619,7 @@ class BrowserTabViewModel(
}

private fun shouldClearHistoryOnNewQuery(): Boolean {
val navigation = webNavigationState ?: return false
val navigation = webNavigationState ?: return true
return !currentBrowserViewState().browserShowing && navigation.hasNavigationHistory
}

Expand Down