[UI Tests] testAddRemoveFeaturedImage: Fix album selection (#19221)

* Move waitAndTap to Globals

* Use waitAndTap to select the album

Author: tiagomar

WordPress/UITestsFoundation/Globals.swift

@@ -31,6 +31,17 @@ public func pullToRefresh(app: XCUIApplication = XCUIApplication()) {
     top.press(forDuration: 0.01, thenDragTo: bottom)
 }
 
+public func waitAndTap( _ element: XCUIElement) {
+    var retries = 0
+    let maxRetries = 10
+    if element.waitForIsHittable(timeout: 10) {
+        while element.isHittable && retries < maxRetries {
+            element.tap()
+            retries += 1
+        }
+    }
+}
+
 extension ScreenObject {
 
     // TODO: This was implemented on the original `BaseScreen` and is here just as a copy-paste for the transition.

WordPress/UITestsFoundation/Screens/Media/MediaPickerAlbumListScreen.swift

@@ -18,7 +18,7 @@ public class MediaPickerAlbumListScreen: ScreenObject {
     public func selectAlbum(atIndex index: Int) throws -> MediaPickerAlbumScreen {
         let selectedAlbum = albumListGetter(app).cells.element(boundBy: index)
         XCTAssertTrue(selectedAlbum.waitForExistence(timeout: 5), "Selected album did not load")
-        selectedAlbum.tap()
+        waitAndTap(selectedAlbum)
 
         return try MediaPickerAlbumScreen()
     }

WordPress/WordPressUITests/Utils/XCTest+Extensions.swift

@@ -93,17 +93,6 @@ extension XCTestCase {
         }
     }
 
-    public func waitAndTap( _ element: XCUIElement) {
-        var retries = 0
-        let maxRetries = 10
-        if element.waitForIsHittable(timeout: 10) {
-            while element.isHittable && retries < maxRetries {
-                element.tap()
-                retries += 1
-            }
-        }
-    }
-
     private enum Constants {
         static let homeApp = XCUIApplication(bundleIdentifier: "com.apple.springboard")
     }