diff --git a/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarView.kt b/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarView.kt index 2286fa723..197098e9c 100644 --- a/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarView.kt +++ b/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarView.kt @@ -318,9 +318,7 @@ class AwesomeBarView( providersToAdd.add(getLocalTabsProvider(state.searchEngineSource, true)) } - if (!activity.settings().showUnifiedSearchFeature) { - providersToAdd.add(searchEngineSuggestionProvider) - } + providersToAdd.add(searchEngineSuggestionProvider) return providersToAdd } diff --git a/app/src/test/java/org/mozilla/fenix/search/awesomebar/AwesomeBarViewTest.kt b/app/src/test/java/org/mozilla/fenix/search/awesomebar/AwesomeBarViewTest.kt index 3cbc2a0aa..3a55e35a4 100644 --- a/app/src/test/java/org/mozilla/fenix/search/awesomebar/AwesomeBarViewTest.kt +++ b/app/src/test/java/org/mozilla/fenix/search/awesomebar/AwesomeBarViewTest.kt @@ -765,7 +765,7 @@ class AwesomeBarViewTest { } @Test - fun `GIVEN unified search feature is enabled WHEN configuring providers THEN don't add the engine suggestions provider`() { + fun `GIVEN a search is made by the user WHEN configuring providers THEN search engine suggestion provider should always be added`() { val settings: Settings = mockk(relaxed = true) { every { showUnifiedSearchFeature } returns true } @@ -776,21 +776,6 @@ class AwesomeBarViewTest { val result = awesomeBarView.getProvidersToAdd(state) - assertEquals(0, result.filterIsInstance().size) - } - - @Test - fun `GIVEN unified search feature is disabled WHEN configuring providers THEN add the engine suggestions provider`() { - val settings: Settings = mockk(relaxed = true) { - every { showUnifiedSearchFeature } returns false - } - every { activity.settings() } returns settings - val state = getSearchProviderState( - searchEngineSource = SearchEngineSource.Default(mockk(relaxed = true)), - ) - - val result = awesomeBarView.getProvidersToAdd(state) - assertEquals(1, result.filterIsInstance().size) } @@ -834,7 +819,7 @@ class AwesomeBarViewTest { } @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 only search engine suggestion provider`() { val settings: Settings = mockk(relaxed = true) { every { showUnifiedSearchFeature } returns true } @@ -862,7 +847,7 @@ class AwesomeBarViewTest { assertEquals(0, result.filterIsInstance().size) assertEquals(0, result.filterIsInstance().size) assertEquals(0, result.filterIsInstance().size) - assertEquals(0, result.filterIsInstance().size) + assertEquals(1, result.filterIsInstance().size) } @Test