Merge pull request #16993 from wordpress-mobile/UI-tests-JP-and-Nuage-fix

[UI Tests] Addressing the `Nuage Laboratoire` issue and accidental(?) JP banner tap.

Author: pachlava

WordPress/src/androidTest/java/org/wordpress/android/e2e/flows/LoginFlow.java

@@ -38,6 +38,7 @@ public LoginFlow chooseContinueWithWpCom() {
     public LoginFlow enterEmailAddress(String emailAddress) {
         // Email Address Screen – Fill it in and click "Continue"
         // See LoginEmailFragment
+        clickOn(R.id.input);
         populateTextField(R.id.input, emailAddress);
         clickOn(R.id.login_continue_button);
         return this;
@@ -46,6 +47,7 @@ public LoginFlow enterEmailAddress(String emailAddress) {
     public LoginFlow enterPassword(String password) {
         // Password Screen – Fill it in and click "Continue"
         // See LoginEmailPasswordFragment
+        clickOn(R.id.input);
         populateTextField(R.id.input, password);
         clickOn(R.id.bottom_button);
         return this;
@@ -104,7 +106,9 @@ public LoginFlow enterUsernameAndPassword(String username, String password) {
                 Matchers.instanceOf(EditText.class)));
         ViewInteraction passwordElement = onView(allOf(isDescendantOfA(withId(R.id.login_password_row)),
                 Matchers.instanceOf(EditText.class)));
+        clickOn(usernameElement);
         populateTextField(usernameElement, username + "\n");
+        clickOn(passwordElement);
         populateTextField(passwordElement, password + "\n");
         clickOn(R.id.bottom_button);
         return this;
@@ -120,6 +124,7 @@ public LoginFlow chooseEnterYourSiteAddress() {
     public LoginFlow enterSiteAddress(String siteAddress) {
         // Site Address Screen – Fill it in and click "Continue"
         // See LoginSiteAddressFragment
+        clickOn(R.id.input);
         populateTextField(R.id.input, siteAddress);
         clickOn(R.id.bottom_button);
         return this;

WordPress/src/androidTest/java/org/wordpress/android/support/WPSupportUtils.java

@@ -820,9 +820,17 @@ public static void scrollIntoView(Integer scrollableContainerID, ViewInteraction
     }
 
     public static void dismissJetpackAdIfPresent() {
+        String jetpackAdText = "Stats, Reader, Notifications, and other features are powered by Jetpack.";
+        ViewInteraction jetpackBanner = onView(withText(jetpackAdText));
+
         // Dismiss Jetpack ad that might be shown after Sign-Up or after opening Stats
-        if (isElementDisplayed(onView(withText("Jetpack powered")))) {
+        if (isElementDisplayed(jetpackBanner)) {
             clickOn(onView(withId(R.id.secondary_button)));
+            waitForElementToNotBeDisplayed(jetpackBanner);
+
+            // Account for potential Emulator slowness on CI: the case of banner text
+            // being already hidden, but top part of banner still sliding away
+            idleFor(1000);
         }
     }
 }