diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/SmokeTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/SmokeTest.kt index b056de1bb8..a97a7d4c46 100644 --- a/app/src/androidTest/java/org/mozilla/fenix/ui/SmokeTest.kt +++ b/app/src/androidTest/java/org/mozilla/fenix/ui/SmokeTest.kt @@ -14,7 +14,6 @@ import androidx.test.uiautomator.UiDevice import okhttp3.mockwebserver.MockWebServer import org.junit.After import org.junit.Before -import org.junit.Ignore import org.junit.Rule import org.junit.Test import org.mozilla.fenix.R @@ -50,10 +49,6 @@ class SmokeTest { private var recentlyClosedTabsListIdlingResource: RecyclerViewIdlingResource? = null private var readerViewNotification: ViewVisibilityIdlingResource? = null private val downloadFileName = "Globe.svg" - private val searchEngine = object { - var title = "Ecosia" - var url = "https://www.ecosia.org/search?q=%s" - } val collectionName = "First Collection" private var bookmarksListIdlingResource: RecyclerViewIdlingResource? = null @@ -522,32 +517,6 @@ class SmokeTest { } } - @Ignore("Failing, see: https://github.com/mozilla-mobile/fenix/issues/17847") - @Test - // Verifies setting as default a customized search engine name and URL - fun editCustomSearchEngineTest() { - homeScreen { - }.openThreeDotMenu { - }.openSettings { - }.openSearchSubMenu { - openAddSearchEngineMenu() - selectAddCustomSearchEngine() - typeCustomEngineDetails(searchEngine.title, searchEngine.url) - saveNewSearchEngine() - openEngineOverflowMenu("Ecosia") - clickEdit() - typeCustomEngineDetails("Test", searchEngine.url) - saveEditSearchEngine() - changeDefaultSearchEngine("Test") - }.goBack { - }.goBack { - }.openSearch { - verifyDefaultSearchEngine("Test") - clickSearchEngineShortcutButton() - verifyEnginesListShortcutContains("Test") - } - } - @Test // Swipes the nav bar left/right to switch between tabs fun swipeToSwitchTabTest() { diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuSearchRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuSearchRobot.kt index da518f563f..92c29ce008 100644 --- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuSearchRobot.kt +++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuSearchRobot.kt @@ -8,25 +8,20 @@ package org.mozilla.fenix.ui.robots import androidx.recyclerview.widget.RecyclerView import androidx.test.espresso.Espresso.onView -import androidx.test.espresso.action.ViewActions.clearText import androidx.test.espresso.action.ViewActions.click -import androidx.test.espresso.action.ViewActions.typeText import androidx.test.espresso.assertion.ViewAssertions.matches import androidx.test.espresso.contrib.RecyclerViewActions import androidx.test.espresso.matcher.ViewMatchers.Visibility import androidx.test.espresso.matcher.ViewMatchers.hasDescendant import androidx.test.espresso.matcher.ViewMatchers.isDisplayed -import androidx.test.espresso.matcher.ViewMatchers.withChild +import androidx.test.espresso.matcher.ViewMatchers.withContentDescription import androidx.test.espresso.matcher.ViewMatchers.withEffectiveVisibility import androidx.test.espresso.matcher.ViewMatchers.withId import androidx.test.espresso.matcher.ViewMatchers.withText -import androidx.test.espresso.matcher.ViewMatchers.withContentDescription -import androidx.test.espresso.matcher.ViewMatchers.withParent import androidx.test.platform.app.InstrumentationRegistry import androidx.test.uiautomator.UiDevice import androidx.test.uiautomator.UiSelector import org.hamcrest.CoreMatchers -import org.hamcrest.CoreMatchers.allOf import org.mozilla.fenix.R import org.mozilla.fenix.helpers.TestAssetHelper.waitingTime import org.mozilla.fenix.helpers.click @@ -67,33 +62,6 @@ class SettingsSubMenuSearchRobot { saveNewSearchEngine() } - fun selectAddCustomSearchEngine() = onView(withText("Other")).click() - - fun typeCustomEngineDetails(engineName: String, engineURL: String) { - onView(withId(R.id.edit_engine_name)) - .perform(clearText()) - .perform(typeText(engineName)) - onView(withId(R.id.edit_search_string)) - .perform(clearText()) - .perform(typeText(engineURL)) - } - - fun openEngineOverflowMenu(searchEngineName: String) { - mDevice.findObject( - UiSelector().resourceId("org.mozilla.fenix.debug:id/overflow_menu") - ).waitForExists(waitingTime) - threeDotMenu(searchEngineName).click() - } - - fun clickEdit() = onView(withText("Edit")).click() - - fun saveEditSearchEngine() { - onView(withId(R.id.save_button)).click() - mDevice.findObject( - UiSelector().resourceId("org.mozilla.fenix.debug:id/recycler_view") - ).waitForExists(waitingTime) - } - class Transition { val mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation()) @@ -220,11 +188,3 @@ private fun addSearchEngineSaveButton() = onView(withId(R.id.add_search_engine)) private fun assertEngineListContains(searchEngineName: String) { onView(withId(R.id.search_engine_group)).check(matches(hasDescendant(withText(searchEngineName)))) } - -private fun threeDotMenu(searchEngineName: String) = - onView( - allOf( - withId(R.id.overflow_menu), - withParent(withChild(withText(searchEngineName))) - ) - )