Fix swipeTo to use _isDisplayedSafe and increase wait timeouts for swipe tests

Author: kobenguyent

lib/helper/Appium.js

@@ -1319,28 +1319,26 @@ class Appium extends Webdriver {
     let currentSource
     return browser
       .waitUntil(
-        () => {
+        async () => {
           if (err) {
             return new Error(`Scroll to the end and element ${searchableLocator} was not found`)
           }
-          return browser
-            .$$(parseLocator.call(this, searchableLocator))
-            .then(els => els.length && els[0].isDisplayed())
-            .then(res => {
-              if (res) {
-                return true
-              }
-              return this[direction](scrollLocator, offset, speed)
-                .getSource()
-                .then(source => {
-                  if (source === currentSource) {
-                    err = true
-                  } else {
-                    currentSource = source
-                    return false
-                  }
-                })
-            })
+          const els = await browser.$$(parseLocator.call(this, searchableLocator))
+          if (els.length) {
+            const displayed = await this._isDisplayedSafe(els[0])
+            if (displayed) {
+              return true
+            }
+          }
+
+          await this[direction](scrollLocator, offset, speed)
+          const source = await this.browser.getPageSource()
+          if (source === currentSource) {
+            err = true
+          } else {
+            currentSource = source
+            return false
+          }
         },
         timeout * 1000,
         errorMsg,

test/helper/Appium_test.js

@@ -367,7 +367,7 @@ describe('Appium', function () {
         await app.tap("//android.widget.Button[@resource-id = 'io.selendroid.testapp:id/touchTest']")
         await app.waitForText('Gesture Type', 10, "//android.widget.TextView[@resource-id = 'io.selendroid.testapp:id/gesture_type_text_view']")
         await app.swipeUp("//android.widget.TextView[@resource-id = 'io.selendroid.testapp:id/gesture_type_text_view']")
-        await app.waitForElement("//android.widget.TextView[@resource-id = 'io.selendroid.testapp:id/text_view4']", 5)
+        await app.waitForElement("//android.widget.TextView[@resource-id = 'io.selendroid.testapp:id/text_view4']", 10)
         const type = await app.grabTextFrom("//android.widget.TextView[@resource-id = 'io.selendroid.testapp:id/gesture_type_text_view']")
         const vy = await app.grabTextFrom("//android.widget.TextView[@resource-id = 'io.selendroid.testapp:id/text_view4']")
         assert.equal(type, 'FLICK')
@@ -379,7 +379,7 @@ describe('Appium', function () {
         await app.tap("//android.widget.Button[@resource-id = 'io.selendroid.testapp:id/touchTest']")
         await app.waitForText('Gesture Type', 10, "//android.widget.TextView[@resource-id = 'io.selendroid.testapp:id/gesture_type_text_view']")
         await app.swipeUp("//android.widget.TextView[@resource-id = 'io.selendroid.testapp:id/gesture_type_text_view']")
-        await app.waitForElement("//android.widget.TextView[@resource-id = 'io.selendroid.testapp:id/text_view4']", 5)
+        await app.waitForElement("//android.widget.TextView[@resource-id = 'io.selendroid.testapp:id/text_view4']", 10)
         const type = await app.grabTextFrom("//android.widget.TextView[@resource-id = 'io.selendroid.testapp:id/gesture_type_text_view']")
         const vy = await app.grabTextFrom("//android.widget.TextView[@resource-id = 'io.selendroid.testapp:id/text_view4']")
         assert.equal(type, 'FLICK')