Bug 1844960 - Bookmark suggestions should appear unconcerned with the search suggestions setting.

fenix/119.0
iorgamgabriel 1 year ago committed by mergify[bot]
parent 876b9038b2
commit 7019fb7654

@ -188,6 +188,7 @@ class AwesomeBarView(
title = R.string.search_engine_suggestions_title, title = R.string.search_engine_suggestions_title,
description = activity.getString(R.string.search_engine_suggestions_description), description = activity.getString(R.string.search_engine_suggestions_description),
searchIcon = searchWithBitmap, searchIcon = searchWithBitmap,
suggestionsHeader = getSearchEngineSuggestionsHeader(),
) )
searchSuggestionProviderMap = HashMap() searchSuggestionProviderMap = HashMap()
@ -318,9 +319,7 @@ class AwesomeBarView(
providersToAdd.add(getLocalTabsProvider(state.searchEngineSource, true)) providersToAdd.add(getLocalTabsProvider(state.searchEngineSource, true))
} }
if (!activity.settings().showUnifiedSearchFeature) { providersToAdd.add(searchEngineSuggestionProvider)
providersToAdd.add(searchEngineSuggestionProvider)
}
return providersToAdd return providersToAdd
} }

@ -765,7 +765,7 @@ class AwesomeBarViewTest {
} }
@Test @Test
fun `GIVEN unified search feature is enabled WHEN configuring providers THEN don't add the engine suggestions provider`() { fun `GIVEN unified search feature is enabled WHEN configuring providers THEN add the engine suggestions provider`() {
val settings: Settings = mockk(relaxed = true) { val settings: Settings = mockk(relaxed = true) {
every { showUnifiedSearchFeature } returns true every { showUnifiedSearchFeature } returns true
} }
@ -776,7 +776,7 @@ class AwesomeBarViewTest {
val result = awesomeBarView.getProvidersToAdd(state) val result = awesomeBarView.getProvidersToAdd(state)
assertEquals(0, result.filterIsInstance<SearchEngineSuggestionProvider>().size) assertEquals(1, result.filterIsInstance<SearchEngineSuggestionProvider>().size)
} }
@Test @Test
@ -834,7 +834,7 @@ class AwesomeBarViewTest {
} }
@Test @Test
fun `GIVEN a search from the default engine with no suggestions asked WHEN configuring providers THEN don't add any provider`() { fun `GIVEN a search from the default engine with no suggestions asked WHEN configuring providers THEN add any provider`() {
val settings: Settings = mockk(relaxed = true) { val settings: Settings = mockk(relaxed = true) {
every { showUnifiedSearchFeature } returns true every { showUnifiedSearchFeature } returns true
} }
@ -862,7 +862,7 @@ class AwesomeBarViewTest {
assertEquals(0, result.filterIsInstance<SearchSuggestionProvider>().size) assertEquals(0, result.filterIsInstance<SearchSuggestionProvider>().size)
assertEquals(0, result.filterIsInstance<SyncedTabsStorageSuggestionProvider>().size) assertEquals(0, result.filterIsInstance<SyncedTabsStorageSuggestionProvider>().size)
assertEquals(0, result.filterIsInstance<SessionSuggestionProvider>().size) assertEquals(0, result.filterIsInstance<SessionSuggestionProvider>().size)
assertEquals(0, result.filterIsInstance<SearchEngineSuggestionProvider>().size) assertEquals(1, result.filterIsInstance<SearchEngineSuggestionProvider>().size)
} }
@Test @Test

Loading…
Cancel
Save