For #12025: Set Search Shortcuts Off By Default
parent
a18c1befd1
commit
2ac8496315
|
@ -50,6 +50,12 @@ class SearchTest {
|
||||||
@Test
|
@Test
|
||||||
fun shortcutButtonTest() {
|
fun shortcutButtonTest() {
|
||||||
homeScreen {
|
homeScreen {
|
||||||
|
}.openThreeDotMenu {
|
||||||
|
}.openSettings {
|
||||||
|
}.openSearchSubMenu {
|
||||||
|
enableShowSearchShortcuts()
|
||||||
|
}.goBack {
|
||||||
|
}.goBack {
|
||||||
}.openSearch {
|
}.openSearch {
|
||||||
verifySearchWithText()
|
verifySearchWithText()
|
||||||
clickSearchEngineButton("DuckDuckGo")
|
clickSearchEngineButton("DuckDuckGo")
|
||||||
|
@ -63,6 +69,12 @@ class SearchTest {
|
||||||
@Test
|
@Test
|
||||||
fun shortcutSearchEngineSettingsTest() {
|
fun shortcutSearchEngineSettingsTest() {
|
||||||
homeScreen {
|
homeScreen {
|
||||||
|
}.openThreeDotMenu {
|
||||||
|
}.openSettings {
|
||||||
|
}.openSearchSubMenu {
|
||||||
|
enableShowSearchShortcuts()
|
||||||
|
}.goBack {
|
||||||
|
}.goBack {
|
||||||
}.openSearch {
|
}.openSearch {
|
||||||
scrollToSearchEngineSettings()
|
scrollToSearchEngineSettings()
|
||||||
clickSearchEngineSettings()
|
clickSearchEngineSettings()
|
||||||
|
|
|
@ -36,6 +36,7 @@ class SettingsSubMenuSearchRobot {
|
||||||
selectDefaultSearchEngine(searchEngineName)
|
selectDefaultSearchEngine(searchEngineName)
|
||||||
|
|
||||||
fun disableShowSearchSuggestions() = toggleShowSearchSuggestions()
|
fun disableShowSearchSuggestions() = toggleShowSearchSuggestions()
|
||||||
|
fun enableShowSearchShortcuts() = toggleShowSearchShortcuts()
|
||||||
|
|
||||||
class Transition {
|
class Transition {
|
||||||
val mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
|
val mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
|
||||||
|
@ -142,5 +143,16 @@ private fun toggleShowSearchSuggestions() {
|
||||||
.perform(click())
|
.perform(click())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private fun toggleShowSearchShortcuts() {
|
||||||
|
onView(withId(androidx.preference.R.id.recycler_view)).perform(
|
||||||
|
RecyclerViewActions.scrollTo<RecyclerView.ViewHolder>(
|
||||||
|
hasDescendant(withText("Show search shortcuts"))
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
onView(withText("Show search shortcuts"))
|
||||||
|
.perform(click())
|
||||||
|
}
|
||||||
|
|
||||||
private fun goBackButton() =
|
private fun goBackButton() =
|
||||||
onView(CoreMatchers.allOf(withContentDescription("Navigate up")))
|
onView(CoreMatchers.allOf(withContentDescription("Navigate up")))
|
||||||
|
|
|
@ -309,7 +309,7 @@ class Settings private constructor(
|
||||||
|
|
||||||
val shouldShowSearchShortcuts by booleanPreference(
|
val shouldShowSearchShortcuts by booleanPreference(
|
||||||
appContext.getPreferenceKey(R.string.pref_key_show_search_shortcuts),
|
appContext.getPreferenceKey(R.string.pref_key_show_search_shortcuts),
|
||||||
default = true
|
default = false
|
||||||
)
|
)
|
||||||
|
|
||||||
val shouldUseDarkTheme by booleanPreference(
|
val shouldUseDarkTheme by booleanPreference(
|
||||||
|
|
|
@ -150,6 +150,10 @@ class DefaultSearchControllerTest {
|
||||||
@Test
|
@Test
|
||||||
fun `show search shortcuts when setting enabled AND query empty`() {
|
fun `show search shortcuts when setting enabled AND query empty`() {
|
||||||
val text = ""
|
val text = ""
|
||||||
|
testContext.settings().preferences
|
||||||
|
.edit()
|
||||||
|
.putBoolean(testContext.getString(R.string.pref_key_show_search_shortcuts), true)
|
||||||
|
.apply()
|
||||||
|
|
||||||
controller.handleTextChanged(text)
|
controller.handleTextChanged(text)
|
||||||
|
|
||||||
|
@ -160,6 +164,10 @@ class DefaultSearchControllerTest {
|
||||||
fun `show search shortcuts when setting enabled AND query equals url`() {
|
fun `show search shortcuts when setting enabled AND query equals url`() {
|
||||||
val text = "mozilla.org"
|
val text = "mozilla.org"
|
||||||
every { session?.url } returns "mozilla.org"
|
every { session?.url } returns "mozilla.org"
|
||||||
|
testContext.settings().preferences
|
||||||
|
.edit()
|
||||||
|
.putBoolean(testContext.getString(R.string.pref_key_show_search_shortcuts), true)
|
||||||
|
.apply()
|
||||||
|
|
||||||
assertEquals(text, session?.url)
|
assertEquals(text, session?.url)
|
||||||
|
|
||||||
|
|
|
@ -254,7 +254,7 @@ class SettingsTest {
|
||||||
fun shouldShowSearchShortcuts() {
|
fun shouldShowSearchShortcuts() {
|
||||||
// When just created
|
// When just created
|
||||||
// Then
|
// Then
|
||||||
assertTrue(settings.shouldShowSearchShortcuts)
|
assertFalse(settings.shouldShowSearchShortcuts)
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
|
Loading…
Reference in New Issue