[fenix] For https://github.com/mozilla-mobile/fenix/issues/20702: fix tests flakiness

app/src/androidTest/java/org/mozilla/fenix/ui/CollectionTest.kt

@@ -9,7 +9,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.helpers.AndroidAssetDispatcher
@@ -166,7 +165,6 @@ class CollectionTest {
     }
 
     @Test
-    @Ignore("To be fixed in https://github.com/mozilla-mobile/fenix/issues/20702")
     fun swipeToRemoveTabFromCollectionTest() {
         val firstWebPage = getGenericAsset(mockWebServer, 1)
         val secondWebPage = getGenericAsset(mockWebServer, 2)
@@ -184,10 +182,13 @@ class CollectionTest {
         }.openThreeDotMenu {
         }.openSaveToCollection {
         }.selectExistingCollection(firstCollectionName) {
-        }.goToHomescreen {}
+        }.openTabDrawer {
+            closeTab()
+        }
 
         homeScreen {
         }.expandCollection(firstCollectionName) {
+            swipeToBottom()
             swipeCollectionItemLeft(firstWebPage.title)
             verifyTabSavedInCollection(firstWebPage.title, false)
             swipeCollectionItemRight(secondWebPage.title)

app/src/androidTest/java/org/mozilla/fenix/ui/SmokeTest.kt

@@ -593,7 +593,6 @@ class SmokeTest {
 
     @Test
     // Saves a login, then changes it and verifies the update
-    @Ignore("To be fixed in https://github.com/mozilla-mobile/fenix/issues/20702")
     fun updateSavedLoginTest() {
         val saveLoginTest =
             TestAssetHelper.getSaveLoginAsset(mockWebServer)

app/src/androidTest/java/org/mozilla/fenix/ui/robots/BrowserRobot.kt

@@ -407,7 +407,9 @@ class BrowserRobot {
                 .className(EditText::class.java)
         )
         passwordField.waitForExists(waitingTime)
-        passwordField.setText(password)
+        passwordField.click()
+        passwordField.clearTextField()
+        passwordField.text = password
         // wait until the password is hidden
         assertTrue(mDevice.findObject(UiSelector().text(password)).waitUntilGone(waitingTime))
     }

app/src/androidTest/java/org/mozilla/fenix/ui/robots/CollectionRobot.kt

@@ -6,6 +6,7 @@ import androidx.test.espresso.action.ViewActions.pressImeActionButton
 import androidx.test.espresso.action.ViewActions.replaceText
 import androidx.test.espresso.action.ViewActions.swipeLeft
 import androidx.test.espresso.action.ViewActions.swipeRight
+import androidx.test.espresso.action.ViewActions.swipeUp
 import androidx.test.espresso.assertion.ViewAssertions.doesNotExist
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.matcher.ViewMatchers
@@ -191,6 +192,8 @@ class CollectionRobot {
 
     fun goBackInCollectionFlow() = backButton().click()
 
+    fun swipeToBottom() = onView(withId(R.id.sessionControlRecyclerView)).perform(swipeUp())
+
     class Transition {
         fun collapseCollection(
             title: String,