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

Omnibar: remove old code #5382

Draft
wants to merge 11 commits into
base: develop
Choose a base branch
from
Draft

Omnibar: remove old code #5382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
7f9bfac
Omnibar: remove old code
malmstein Nov 20, 2024
7d566d7
cleaning up btf from direct calls to old omnibar
malmstein Nov 20, 2024
253d68c
remove omnibar feature at all
malmstein Nov 20, 2024
cfc1392
remove references from btf
malmstein Nov 20, 2024
06f2434
remove old legacy layouts
malmstein Nov 20, 2024
5263e1b
remove voice search references
malmstein Nov 20, 2024
365db52
clean up voice search
malmstein Nov 20, 2024
78d6fb7
clean up loading progress state
malmstein Nov 20, 2024
7711b83
clean up loading indicator
malmstein Nov 20, 2024
e41cc43
remove unnecessary callback
malmstein Dec 11, 2024
d701a89
clean up tests
malmstein Dec 11, 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
249 changes: 0 additions & 249 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 @@ -283,7 +283,6 @@ import org.junit.Assert.assertTrue
import org.junit.Before
import org.junit.Rule
import org.junit.Test
import org.mockito.ArgumentMatchers.anyBoolean
import org.mockito.ArgumentMatchers.anyString
import org.mockito.Mockito.never
import org.mockito.Mockito.times
Expand Down Expand Up @@ -646,8 +645,6 @@ class BrowserTabViewModelTest {
ampLinks = mockAmpLinks,
downloadCallback = mockDownloadCallback,
trackingParameters = mockTrackingParameters,
voiceSearchAvailability = voiceSearchAvailability,
voiceSearchPixelLogger = voiceSearchPixelLogger,
settingsDataStore = mockSettingsDataStore,
adClickManager = mockAdClickManager,
autofillCapabilityChecker = autofillCapabilityChecker,
Expand Down Expand Up @@ -1162,18 +1159,6 @@ class BrowserTabViewModelTest {
assertCommandIssued<Command.ShowWebContent>()
}

@Test
fun whenViewModelNotifiedThatUrlGotFocusThenViewStateIsUpdated() = runTest {
testee.onOmnibarInputStateChanged("", true, hasQueryChanged = false)
assertTrue(omnibarViewState().isEditing)
}

@Test
fun whenViewModelNotifiedThatUrlLostFocusThenViewStateIsUpdated() {
testee.onOmnibarInputStateChanged("", false, hasQueryChanged = false)
assertFalse(omnibarViewState().isEditing)
}

@Test
fun whenNoOmnibarTextEverEnteredThenViewStateHasEmptyString() {
assertEquals("", omnibarViewState().omnibarText)
Expand Down Expand Up @@ -1296,124 +1281,16 @@ class BrowserTabViewModelTest {
assertTrue(browserViewState().showPrivacyShield.isEnabled())
}

@Test
fun whenOmnibarDoesNotHaveFocusThenPrivacyGradeIsShownAndSearchIconIsHidden() {
testee.onOmnibarInputStateChanged(query = "", hasFocus = false, hasQueryChanged = false)
assertTrue(browserViewState().showPrivacyShield.isEnabled())
assertFalse(browserViewState().showSearchIcon)
}

@Test
fun whenBrowserShownAndOmnibarInputDoesNotHaveFocusThenPrivacyGradeIsShownAndSearchIconIsHidden() {
whenever(mockOmnibarConverter.convertQueryToUrl("foo", null)).thenReturn("foo.com")
testee.onUserSubmittedQuery("foo")
testee.onOmnibarInputStateChanged(query = "", hasFocus = false, hasQueryChanged = false)
assertTrue(browserViewState().showPrivacyShield.isEnabled())
assertFalse(browserViewState().showSearchIcon)
}

@Test
fun whenBrowserNotShownAndOmnibarInputHasFocusThenPrivacyGradeIsNotShown() {
testee.onOmnibarInputStateChanged("", true, hasQueryChanged = false)
assertFalse(browserViewState().showPrivacyShield.isEnabled())
}

@Test
fun whenBrowserShownAndOmnibarInputHasFocusThenSearchIconIsShownAndPrivacyGradeIsHidden() {
whenever(mockOmnibarConverter.convertQueryToUrl("foo", null)).thenReturn("foo.com")
testee.onUserSubmittedQuery("foo")
testee.onOmnibarInputStateChanged("", true, hasQueryChanged = false)
assertFalse(browserViewState().showPrivacyShield.isEnabled())
assertTrue(browserViewState().showSearchIcon)
}

@Test
fun whenInitialisedThenFireButtonIsShown() {
assertTrue(browserViewState().fireButton is HighlightableButton.Visible)
}

@Test
fun whenOmnibarInputDoesNotHaveFocusAndHasQueryThenFireButtonIsShown() {
testee.onOmnibarInputStateChanged("query", false, hasQueryChanged = false)
assertTrue(browserViewState().fireButton is HighlightableButton.Visible)
}

@Test
fun whenOmnibarInputDoesNotHaveFocusOrQueryThenFireButtonIsShown() {
testee.onOmnibarInputStateChanged("", false, hasQueryChanged = false)
assertTrue(browserViewState().fireButton is HighlightableButton.Visible)
}

@Test
fun whenOmnibarInputHasFocusAndNoQueryThenFireButtonIsShown() {
testee.onOmnibarInputStateChanged("", true, hasQueryChanged = false)
assertTrue(browserViewState().fireButton is HighlightableButton.Visible)
}

@Test
fun whenOmnibarInputHasFocusAndQueryThenFireButtonIsHidden() {
testee.onOmnibarInputStateChanged("query", true, hasQueryChanged = false)
assertTrue(browserViewState().fireButton is HighlightableButton.Gone)
}

@Test
fun whenInitialisedThenTabsButtonIsShown() {
assertTrue(browserViewState().showTabsButton)
}

@Test
fun whenOmnibarInputDoesNotHaveFocusOrQueryThenTabsButtonIsShown() {
testee.onOmnibarInputStateChanged("", false, hasQueryChanged = false)
assertTrue(browserViewState().showTabsButton)
}

@Test
fun whenOmnibarInputDoesNotHaveFocusAndHasQueryThenTabsButtonIsShown() {
testee.onOmnibarInputStateChanged("query", false, hasQueryChanged = false)
assertTrue(browserViewState().showTabsButton)
}

@Test
fun whenOmnibarInputHasFocusAndNoQueryThenTabsButtonIsShown() {
testee.onOmnibarInputStateChanged("", true, hasQueryChanged = false)
assertTrue(browserViewState().showTabsButton)
}

@Test
fun whenOmnibarInputHasFocusAndQueryThenTabsButtonIsHidden() {
testee.onOmnibarInputStateChanged("query", true, hasQueryChanged = false)
assertFalse(browserViewState().showTabsButton)
}

@Test
fun whenInitialisedThenMenuButtonIsShown() {
assertTrue(browserViewState().showMenuButton.isEnabled())
}

@Test
fun whenOmnibarInputDoesNotHaveFocusOrQueryThenMenuButtonIsShown() {
testee.onOmnibarInputStateChanged("", false, hasQueryChanged = false)
assertTrue(browserViewState().showMenuButton.isEnabled())
}

@Test
fun whenOmnibarInputDoesNotHaveFocusAndHasQueryThenMenuButtonIsShown() {
testee.onOmnibarInputStateChanged("query", false, hasQueryChanged = false)
assertTrue(browserViewState().showMenuButton.isEnabled())
}

@Test
fun whenOmnibarInputHasFocusAndNoQueryThenMenuButtonIsShown() {
testee.onOmnibarInputStateChanged("", true, hasQueryChanged = false)
assertTrue(browserViewState().showMenuButton.isEnabled())
}

@Test
fun whenOmnibarInputHasFocusAndQueryThenMenuButtonIsHidden() {
testee.onOmnibarInputStateChanged("query", true, hasQueryChanged = false)
assertFalse(browserViewState().showMenuButton.isEnabled())
}

@Test
fun whenTriggeringAutocompleteThenAutoCompleteSuggestionsShown() = runTest {
whenever(mockAutoCompleteService.autoComplete("foo")).thenReturn(emptyList())
Expand Down Expand Up @@ -1451,27 +1328,6 @@ class BrowserTabViewModelTest {
assertTrue(autoCompleteViewState().showFavorites)
}

@Test
fun whenEnteringQueryWithAutoCompleteDisabledThenAutoCompleteSuggestionsNotShown() {
doReturn(false).whenever(mockSettingsStore).autoCompleteSuggestionsEnabled
testee.onOmnibarInputStateChanged("foo", true, hasQueryChanged = true)
assertFalse(autoCompleteViewState().showSuggestions)
}

@Test
fun whenEnteringEmptyQueryWithAutoCompleteEnabledThenAutoCompleteSuggestionsNotShown() {
doReturn(true).whenever(mockSettingsStore).autoCompleteSuggestionsEnabled
testee.onOmnibarInputStateChanged("", true, hasQueryChanged = true)
assertFalse(autoCompleteViewState().showSuggestions)
}

@Test
fun whenEnteringEmptyQueryWithAutoCompleteDisabledThenAutoCompleteSuggestionsNotShown() {
doReturn(false).whenever(mockSettingsStore).autoCompleteSuggestionsEnabled
testee.onOmnibarInputStateChanged("", true, hasQueryChanged = true)
assertFalse(autoCompleteViewState().showSuggestions)
}

@Test
fun wheneverAutoCompleteIsGoneAndHistoryIAMHasBeenShownThenNotifyUserSeenIAM() {
runTest {
Expand Down Expand Up @@ -2995,28 +2851,6 @@ class BrowserTabViewModelTest {
assertTrue(browserViewState().canPrintPage)
}

@Test
fun whenBrowsingDDGSiteThenDaxIconIsVisible() {
val url = "https://duckduckgo.com?q=test%20search"
loadUrl(url, isBrowserShowing = true)
assertTrue(browserViewState().showDaxIcon)
assertFalse(browserViewState().showSearchIcon)
}

@Test
fun whenBrowsingNonDDGSiteAndPrivacyGradeIsVisibleThenDaxIconIsNotVisible() {
val url = "https://example.com"
loadUrl(url, isBrowserShowing = true)
assertFalse(browserViewState().showDaxIcon)
assertTrue(browserViewState().showPrivacyShield.isEnabled())
}

@Test
fun whenNotBrowsingAndDDGUrlPresentThenDaxIconIsNotVisible() {
loadUrl("https://duckduckgo.com?q=test%20search", isBrowserShowing = false)
assertFalse(browserViewState().showDaxIcon)
}

@Test
fun whenQueryIsNotHierarchicalThenUnsupportedOperationExceptionIsHandled() {
whenever(mockOmnibarConverter.convertQueryToUrl("about:blank", null)).thenReturn("about:blank")
Expand Down Expand Up @@ -4085,44 +3919,6 @@ class BrowserTabViewModelTest {
assertTrue(oldForceRenderingTicker != browserViewState().forceRenderingTicker)
}

@Test
fun whenShouldShowVoiceSearchAndUserSubmittedQueryThenUpdateOmnibarViewStateToShowVoiceSearchTrue() {
whenever(mockOmnibarConverter.convertQueryToUrl("foo", null)).thenReturn("foo.com")
whenever(voiceSearchAvailability.shouldShowVoiceSearch(anyBoolean(), anyString(), anyBoolean(), anyString())).thenReturn(true)

testee.onUserSubmittedQuery("foo")

assertTrue(browserViewState().showVoiceSearch)
}

@Test
fun whenShouldShowVoiceSearchAndUserNavigatesHomeThenUpdateOmnibarViewStateToShowVoiceSearchTrue() {
whenever(voiceSearchAvailability.shouldShowVoiceSearch(anyBoolean(), anyString(), anyBoolean(), anyString())).thenReturn(true)
setupNavigation(skipHome = false, isBrowsing = true, canGoBack = false)

testee.onUserPressedBack()

assertTrue(browserViewState().showVoiceSearch)
}

@Test
fun whenShouldShowVoiceSearchAndUserLoadedUrlThenUpdateOmnibarViewStateToShowVoiceSearchTrue() {
whenever(voiceSearchAvailability.shouldShowVoiceSearch(anyBoolean(), anyString(), anyBoolean(), anyString())).thenReturn(true)

loadUrl("https://test.com")

assertTrue(browserViewState().showVoiceSearch)
}

@Test
fun whenShouldShowVoiceSearchAndOmnibarInputStateChangedThenUpdateOmnibarViewStateToShowVoiceSearchTrue() {
whenever(voiceSearchAvailability.shouldShowVoiceSearch(anyBoolean(), anyString(), anyBoolean(), anyString())).thenReturn(true)

testee.onOmnibarInputStateChanged("www.fb.com", true, hasQueryChanged = false)

assertTrue(browserViewState().showVoiceSearch)
}

@Test
fun whenInitializedAndVoiceSearchNotSupportedThenDontLogVoiceSearch() {
verify(voiceSearchPixelLogger, never()).log()
Expand Down Expand Up @@ -4214,26 +4010,22 @@ class BrowserTabViewModelTest {

@Test
fun whenNotEditingUrlBarAndNotCancelledThenCanAutomaticallyShowAutofillPrompt() {
configureOmnibarNotEditing()
assertTrue(testee.canAutofillSelectCredentialsDialogCanAutomaticallyShow())
}

@Test
fun whenEditingUrlBarAndNotCancelledThenCannotAutomaticallyShowAutofillPrompt() {
configureOmnibarEditing()
assertFalse(testee.canAutofillSelectCredentialsDialogCanAutomaticallyShow())
}

@Test
fun whenNotEditingUrlBarAndCancelledThenCannotAutomaticallyShowAutofillPrompt() {
configureOmnibarNotEditing()
testee.cancelPendingAutofillRequestToChooseCredentials()
assertFalse(testee.canAutofillSelectCredentialsDialogCanAutomaticallyShow())
}

@Test
fun whenEditingUrlBarAndCancelledThenCannotAutomaticallyShowAutofillPrompt() {
configureOmnibarEditing()
testee.cancelPendingAutofillRequestToChooseCredentials()
assertFalse(testee.canAutofillSelectCredentialsDialogCanAutomaticallyShow())
}
Expand Down Expand Up @@ -4350,15 +4142,6 @@ class BrowserTabViewModelTest {
assertFalse(omnibarViewState().forceExpand)
}

@Test
fun whenVoiceSearchIsDisabledThenShowVoiceSearchShouldBeFalse() {
whenever(voiceSearchAvailability.shouldShowVoiceSearch(any(), any(), any(), any())).thenReturn(false)

testee.voiceSearchDisabled()

assertFalse(browserViewState().showVoiceSearch)
}

@Test
fun whenOnSitePermissionRequestedThenSendCommand() = runTest {
val request: PermissionRequest = mock()
Expand Down Expand Up @@ -5188,8 +4971,6 @@ class BrowserTabViewModelTest {

assertEquals(EXPIRED, browserViewState().sslError)
assertEquals(false, browserViewState().showPrivacyShield.isEnabled())
assertEquals(false, browserViewState().showDaxIcon)
assertEquals(false, browserViewState().showSearchIcon)
assertEquals(false, loadingViewState().isLoading)
}

Expand Down Expand Up @@ -5228,8 +5009,6 @@ class BrowserTabViewModelTest {

assertEquals(EXPIRED, browserViewState().sslError)
assertEquals(false, browserViewState().showPrivacyShield.isEnabled())
assertEquals(false, browserViewState().showDaxIcon)
assertEquals(false, browserViewState().showSearchIcon)
assertEquals(false, loadingViewState().isLoading)
}

Expand Down Expand Up @@ -5342,8 +5121,6 @@ class BrowserTabViewModelTest {
assertEquals(NONE, browserViewState().sslError)
assertEquals(false, browserViewState().browserShowing)
assertEquals(false, browserViewState().showPrivacyShield.isEnabled())
assertEquals(true, browserViewState().showSearchIcon)
assertEquals(false, browserViewState().showDaxIcon)

assertEquals(false, loadingViewState().isLoading)

Expand Down Expand Up @@ -5718,24 +5495,6 @@ class BrowserTabViewModelTest {
assertEquals("duck://player/1234", omnibarViewState().omnibarText)
}

@Test
fun whenNewPageWithUrlYouTubeNoCookieThenShowDuckPlayerIcon() = runTest {
whenever(mockDuckPlayer.getDuckPlayerState()).thenReturn(ENABLED)
whenever(mockDuckPlayer.isSimulatedYoutubeNoCookie("https://youtube-nocookie.com/?videoID=1234".toUri())).thenReturn(true)
whenever(mockDuckPlayer.isSimulatedYoutubeNoCookie("duck://player/1234".toUri())).thenReturn(false)
whenever(mockDuckPlayer.createDuckPlayerUriFromYoutubeNoCookie("https://youtube-nocookie.com/?videoID=1234".toUri())).thenReturn(
"duck://player/1234",
)
whenever(mockDuckPlayer.isDuckPlayerUri("duck://player/1234")).thenReturn(true)
whenever(mockDuckPlayer.getDuckPlayerState()).thenReturn(ENABLED)

testee.browserViewState.value = browserViewState().copy(browserShowing = true)

testee.navigationStateChanged(buildWebNavigation("https://youtube-nocookie.com/?videoID=1234"))

assertTrue(browserViewState().showDuckPlayerIcon)
}

@Test
fun whenNewPageAndBrokenSitePromptVisibleThenHideCta() = runTest {
setCta(BrokenSitePromptDialogCta())
Expand Down Expand Up @@ -5866,14 +5625,6 @@ class BrowserTabViewModelTest {
}
}

private fun configureOmnibarEditing() {
testee.onOmnibarInputStateChanged(hasFocus = true, query = "", hasQueryChanged = false)
}

private fun configureOmnibarNotEditing() {
testee.onOmnibarInputStateChanged(hasFocus = false, query = "", hasQueryChanged = false)
}

private fun buildNavigationHistoryStack(stackSize: Int) {
val history = mutableListOf<NavigationHistoryEntry>()
for (i in 0 until stackSize) {
Expand Down
Loading
Loading