Bug 1826318 - Fix verifyCreditCardsAutofillToggleTest UI test

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

@@ -88,7 +88,7 @@ class CreditCardAutofillTest {
         }
         navigationToolbar {
         }.enterURLAndEnterToBrowser(creditCardFormPage.url) {
-            clickPageObject(itemWithResId("cardNumber"))
+            clickCreditCardNumberTextBox()
             clickPageObject(itemWithResId("$packageName:id/select_credit_card_header"))
             clickPageObject(
                 itemWithResIdContainingText(
@@ -200,7 +200,7 @@ class CreditCardAutofillTest {
 
         navigationToolbar {
         }.enterURLAndEnterToBrowser(creditCardFormPage.url) {
-            clickPageObject(itemWithResId("cardNumber"))
+            clickCreditCardNumberTextBox()
             clickPageObject(itemWithResId("$packageName:id/select_credit_card_header"))
         }.clickManageCreditCardsButton {
         }.goBackToBrowser {
@@ -231,7 +231,7 @@ class CreditCardAutofillTest {
 
         navigationToolbar {
         }.enterURLAndEnterToBrowser(creditCardFormPage.url) {
-            clickPageObject(itemWithResId("cardNumber"))
+            clickCreditCardNumberTextBox()
             verifySelectCreditCardPromptExists(true)
         }.openThreeDotMenu {
         }.openSettings {
@@ -244,7 +244,7 @@ class CreditCardAutofillTest {
 
         navigationToolbar {
         }.enterURLAndEnterToBrowser(creditCardFormPage.url) {
-            clickPageObject(itemWithResId("cardNumber"))
+            clickCreditCardNumberTextBox()
             verifySelectCreditCardPromptExists(false)
         }
     }
@@ -321,7 +321,7 @@ class CreditCardAutofillTest {
 
         navigationToolbar {
         }.enterURLAndEnterToBrowser(creditCardFormPage.url) {
-            clickPageObject(itemWithResId("cardNumber"))
+            clickCreditCardNumberTextBox()
             clickPageObject(itemWithResId("$packageName:id/select_credit_card_header"))
             clickPageObject(
                 itemWithResIdContainingText(
@@ -408,7 +408,7 @@ class CreditCardAutofillTest {
 
         navigationToolbar {
         }.enterURLAndEnterToBrowser(creditCardFormPage.url) {
-            clickPageObject(itemWithResId("cardNumber"))
+            clickCreditCardNumberTextBox()
             clickPageObject(itemWithResId("$packageName:id/select_credit_card_header"))
             verifyCreditCardSuggestion(
                 MockCreditCard1.MOCK_LAST_CARD_DIGITS,
@@ -498,7 +498,7 @@ class CreditCardAutofillTest {
 
         navigationToolbar {
         }.enterURLAndEnterToBrowser(creditCardFormPage.url) {
-            clickPageObject(itemWithResId("cardNumber"))
+            clickCreditCardNumberTextBox()
             clickPageObject(itemWithResId("$packageName:id/select_credit_card_header"))
             clickPageObject(
                 itemWithResIdContainingText(
@@ -549,7 +549,7 @@ class CreditCardAutofillTest {
 
         navigationToolbar {
         }.enterURLAndEnterToBrowser(creditCardFormPage.url) {
-            clickPageObject(itemWithResId("cardNumber"))
+            clickCreditCardNumberTextBox()
             clickPageObject(itemWithResId("$packageName:id/select_credit_card_header"))
             clickPageObject(
                 itemWithResIdContainingText(

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

@@ -55,6 +55,7 @@ import org.mozilla.fenix.helpers.SessionLoadedIdlingResource
 import org.mozilla.fenix.helpers.TestAssetHelper.waitingTime
 import org.mozilla.fenix.helpers.TestAssetHelper.waitingTimeLong
 import org.mozilla.fenix.helpers.TestAssetHelper.waitingTimeShort
+import org.mozilla.fenix.helpers.TestHelper.appName
 import org.mozilla.fenix.helpers.TestHelper.getStringResource
 import org.mozilla.fenix.helpers.TestHelper.mDevice
 import org.mozilla.fenix.helpers.TestHelper.packageName
@@ -428,6 +429,12 @@ class BrowserRobot {
     fun changeCreditCardExpiryDate(expiryDate: String) =
         itemWithResId("expiryMonthAndYear").setText(expiryDate)
 
+    fun clickCreditCardNumberTextBox() {
+        mDevice.wait(Until.findObject(By.res("cardNumber")), waitingTime)
+        mDevice.findObject(By.res("cardNumber")).click()
+        mDevice.waitForWindowUpdate(appName, waitingTimeShort)
+    }
+
     fun clickCreditCardFormSubmitButton() =
         itemWithResId("submit").clickAndWaitForNewWindow(waitingTime)