Merge pull request appium#2664 from sebv/master

Various test fixes and improvements

bin/test.sh

@@ -100,9 +100,9 @@ if $android_only || $all_tests; then
 fi
 
 if $android_chrome; then
-    echo "RUNNING ANDROID (ARM) TESTS"
+    echo "RUNNING ANDROID CHROME TESTS"
     echo "---------------------"
-    DEVICE=android time $appåium_mocha \
+    DEVICE=android time $appium_mocha \
         -g  '@skip-chrome|@skip-android-all' -i \
         test/functional/android/chrome
 fi
@@ -119,12 +119,8 @@ if $gappium_only || $all_tests; then
     echo "---------------------"
     DEVICE=ios71 time $appium_mocha test/functional/gappium
     DEVICE=ios6 time $appium_mocha test/functional/gappium
-    # TODO: fix android/gappium test, no webview context found, investigate
-    # echo "Start the android emulator and press Enter."    
-    # read
-    # DEVICE=android time $appium_mocha test/functional/gappium
-    # TODO: the gappium app does not work on selendroid, investigate
-    # echo "Start the android emulator and press Enter."
-    # read
-    # DEVICE=selendroid time $appium_mocha test/functional/gappium
+    echo "Start the android emulator api 19 and press Enter."    
+    read
+    DEVICE=android time $appium_mocha test/functional/gappium
+    DEVICE=selendroid time $appium_mocha test/functional/gappium
 fi

test/functional/android/apidemos/attributes-specs.js

@@ -1,20 +1,13 @@
 "use strict";
 
-var env = require('../../../helpers/env')
-  , setup = require("../../common/setup-base")
+var setup = require("../../common/setup-base")
   , desired = require("./desired");
 
 describe("apidemos - attributes", function () {
 
   var driver;
   setup(this, desired).then(function (d) { driver = d; });
 
-  if (env.FAST_TESTS) {
-    beforeEach(function (done) {
-      driver.resetApp().nodeify(done);
-    });
-  }
-
   it('should be able to find text attribute', function (done) {
     driver
       .elementByName('Animation').getAttribute('text')

test/functional/android/apidemos/basic-specs.js

@@ -201,7 +201,7 @@ describe("apidemo - basic @skip-ci", function () {
             pids.length.should.equal(1);
             done();
           });
-        }, 2000);
+        }, 5000);
       });
     });
 

test/functional/android/apidemos/find/basics-specs.js

@@ -3,6 +3,7 @@
 var env = require('../../../../helpers/env')
   , setup = require("../../../common/setup-base")
   , desired = require("../desired")
+  , reset = require("../reset")
   , atv = 'android.widget.TextView';
 
 describe("apidemo - find - basics", function () {
@@ -11,8 +12,8 @@ describe("apidemo - find - basics", function () {
   setup(this, desired).then(function (d) { driver = d; });
 
   if (env.FAST_TESTS) {
-    beforeEach(function (done) {
-      driver.resetApp().nodeify(done);
+    beforeEach(function () {
+      return reset(driver);
     });
   }
 

test/functional/android/apidemos/find/by-accessibility-id-specs.js

@@ -1,20 +1,13 @@
 "use strict";
 
-var env = require('../../../../helpers/env')
-  , setup = require("../../../common/setup-base")
+var setup = require("../../../common/setup-base")
   , desired = require("../desired");
 
 describe("apidemo - find - by accessibility id", function () {
 
   var driver;
   setup(this, desired).then(function (d) { driver = d; });
 
-  if (env.FAST_TESTS) {
-    beforeEach(function (done) {
-      driver.resetApp().nodeify(done);
-    });
-  }
-
   it('should find an element by name', function (done) {
     driver.element('accessibility id', 'Animation').then(function (el) {
       el.should.exist;

test/functional/android/apidemos/find/by-uiautomator-specs.js

@@ -1,20 +1,13 @@
 "use strict";
 
-var env = require('../../../../helpers/env')
-  , setup = require("../../../common/setup-base")
+var setup = require("../../../common/setup-base")
   , desired = require("../desired");
 
 describe("apidemo - find elements - by uiautomator", function () {
 
   var driver;
   setup(this, desired).then(function (d) { driver = d; });
 
-  if (env.FAST_TESTS) {
-    beforeEach(function (done) {
-      driver.resetApp().nodeify(done);
-    });
-  }
-
   it('should find elements with a boolean argument', function (done) {
     driver.elements('-android uiautomator', 'new UiSelector().clickable(true)').then(function (els) {
       els.length.should.be.above(11);

test/functional/android/apidemos/find/by-xpath-specs.js

@@ -1,7 +1,6 @@
 "use strict";
 
-var env = require('../../../../helpers/env')
-  , setup = require("../../../common/setup-base")
+var setup = require("../../../common/setup-base")
   , desired = require("../desired")
   , atv = 'android.widget.TextView'
   , alv = 'android.widget.ListView';
@@ -11,15 +10,14 @@ describe("apidemo - find - by xpath", function () {
   var driver;
   setup(this, desired).then(function (d) { driver = d; });
 
-  if (env.FAST_TESTS) {
-    beforeEach(function (done) {
-      driver.resetApp().nodeify(done);
-    });
-  }
-
   var f = "android.widget.FrameLayout";
   var l = alv;
   var t = atv;
+
+  before(function (done) {
+    driver.sleep(1000).nodeify(done);
+  });
+
   it('should find element by type', function (done) {
     driver
       .elementByXPath('//' + t).text()

test/functional/android/apidemos/find/complex-find-specs.js

@@ -1,20 +1,13 @@
 "use strict";
 
-var env = require('../../../../helpers/env')
-  , setup = require("../../../common/setup-base")
+var setup = require("../../../common/setup-base")
   , desired = require("../desired");
 
 describe("apidemo - find - complex", function () {
 
   var driver;
   setup(this, desired).then(function (d) { driver = d; });
 
-  if (env.FAST_TESTS) {
-    beforeEach(function (done) {
-      driver.resetApp().nodeify(done);
-    });
-  }
-
   it('should scroll to an element by text or content desc', function (done) {
     driver
       .complexFind(["scroll", [[3, "views"]], [[7, "views"]]]).text()

test/functional/android/apidemos/find/from-el-specs.js

@@ -1,7 +1,6 @@
 "use strict";
 
-var env = require('../../../../helpers/env')
-  , setup = require("../../../common/setup-base")
+var setup = require("../../../common/setup-base")
   , desired = require("../desired")
   , atv = 'android.widget.TextView'
   , alv = 'android.widget.ListView';
@@ -11,12 +10,6 @@ describe("apidemo - find - from element", function () {
   var driver;
   setup(this, desired).then(function (d) { driver = d; });
 
-  if (env.FAST_TESTS) {
-    beforeEach(function (done) {
-      driver.resetApp().nodeify(done);
-    });
-  }
-
   it('should find a single element by tag name', function (done) {
     driver.elementByClassName(alv).then(function (el) {
       return el

test/functional/android/apidemos/find/invalid-strategy-specs.js

@@ -1,20 +1,13 @@
 "use strict";
 
-var env = require('../../../../helpers/env')
-  , setup = require("../../../common/setup-base")
+var setup = require("../../../common/setup-base")
   , desired = require("../desired");
 
 describe("apidemo - find - invalid strategy", function () {
 
   var driver;
   setup(this, desired).then(function (d) { driver = d; });
 
-  if (env.FAST_TESTS) {
-    beforeEach(function (done) {
-      driver.resetApp().nodeify(done);
-    });
-  }
-
   it('should not accept -ios uiautomation locator strategy', function (done) {
     driver
       .elements('-ios uiautomation', '.elements()').catch(function (err) {

test/functional/android/apidemos/gestures/click-specs.js

@@ -3,17 +3,16 @@
 var env = require('../../../../helpers/env')
   , setup = require("../../../common/setup-base")
   , desired = require("../desired")
+  , reset = require("../reset")
   , droidText = 'android.widget.TextView';
 
 describe("apidemo - gestures - click", function () {
   var driver;
   setup(this, desired).then(function (d) { driver = d; });
 
   if (env.FAST_TESTS) {
-    beforeEach(function (done) {
-      driver.resetApp()
-        .then(function () { return driver.sleep(3000); })
-        .nodeify(done);
+    beforeEach(function () {
+      return reset(driver);
     });
   }
 

test/functional/android/apidemos/gestures/drag-specs.js

@@ -3,6 +3,7 @@
 var env = require('../../../../helpers/env')
   , setup = require("../../../common/setup-base")
   , desired = require("../desired")
+  , reset = require("../reset")
   , droidText = 'android.widget.TextView'
   , droidList = 'android.widget.ListView'
   , Q = require("q");
@@ -12,10 +13,8 @@ describe("apidemo - gestures - drag", function () {
   setup(this, desired).then(function (d) { driver = d; });
 
   if (env.FAST_TESTS) {
-    beforeEach(function (done) {
-      driver.resetApp()
-        .then(function () { return driver.sleep(3000); })
-        .nodeify(done);
+    beforeEach(function () {
+      return reset(driver);
     });
   }
 

test/functional/android/apidemos/gestures/execute-specs.js

@@ -3,17 +3,16 @@
 var env = require('../../../../helpers/env')
   , setup = require("../../../common/setup-base")
   , desired = require("../desired")
+  , reset = require("../reset")
   , droidText = 'android.widget.TextView';
 
 describe("apidemo - gestures - execute", function () {
   var driver;
   setup(this, desired).then(function (d) { driver = d; });
 
   if (env.FAST_TESTS) {
-    beforeEach(function (done) {
-      driver.resetApp()
-        .then(function () { return driver.sleep(3000); })
-        .nodeify(done);
+    beforeEach(function () {
+      return reset(driver);
     });
   }
 

test/functional/android/apidemos/gestures/flick-specs.js

@@ -2,17 +2,16 @@
 
 var env = require('../../../../helpers/env')
   , setup = require("../../../common/setup-base")
-  , desired = require("../desired");
+  , desired = require("../desired")
+  , reset = require("../reset");
 
 describe("apidemo - gestures - flick", function () {
   var driver;
   setup(this, desired).then(function (d) { driver = d; });
 
   if (env.FAST_TESTS) {
-    beforeEach(function (done) {
-      driver.resetApp()
-        .then(function () { return driver.sleep(3000); })
-        .nodeify(done);
+    beforeEach(function () {
+      return reset(driver);
     });
   }
 

test/functional/android/apidemos/gestures/long-click-specs.js

@@ -3,17 +3,36 @@
 var env = require('../../../../helpers/env')
   , setup = require("../../../common/setup-base")
   , desired = require("../desired")
-  , droidText = 'android.widget.TextView';
+  , reset = require("../reset")
+  , droidText = 'android.widget.TextView'
+  , Q = require('q');
 
 describe("apidemo - gestures - long click", function () {
   var driver;
   setup(this, desired).then(function (d) { driver = d; });
 
+  if (env.FAST_TESTS) {
+    beforeEach(function () {
+      return reset(driver);
+    });
+  }
+
   if (env.FAST_TESTS) {
     beforeEach(function (done) {
-      driver.resetApp()
-        .then(function () { return driver.sleep(3000); })
-        .nodeify(done);
+      function back(depth) {
+        if (depth < 0) return new Q();
+        return driver
+          .elementByNameOrNull("Animation")
+          .then(function (el) {
+            if (el) return;
+            else {
+              return driver.back().then(function () {
+                back(depth - 1);
+              });
+            }
+          });
+        }
+      back(3).nodeify(done);
     });
   }
 

test/functional/android/apidemos/gestures/pinch-specs.js

@@ -1,7 +1,6 @@
 "use strict";
 
-var env = require('../../../../helpers/env')
-  , setup = require("../../../common/setup-base")
+var setup = require("../../../common/setup-base")
   , desired = require("../desired")
   , droidText = 'android.widget.TextView'
   , droidList = 'android.widget.ListView';
@@ -10,14 +9,6 @@ describe("apidemo - gestures - pinch", function () {
   var driver;
   setup(this, desired).then(function (d) { driver = d; });
 
-  if (env.FAST_TESTS) {
-    beforeEach(function (done) {
-      driver.resetApp()
-        .then(function () { return driver.sleep(3000); })
-        .nodeify(done);
-    });
-  }
-
   // todo fix this: got Error response status: 13, Could not scroll element into view: Views
   it('should pinch out/in @skip-android-all', function (done) {
     var scrollOpts;

test/functional/android/apidemos/gestures/scroll-specs.js

@@ -1,22 +1,13 @@
 "use strict";
 
-var env = require('../../../../helpers/env')
-  , setup = require("../../../common/setup-base")
+var setup = require("../../../common/setup-base")
   , desired = require("../desired")
   , droidList = 'android.widget.ListView';
 
 describe("apidemo - gestures - scroll", function () {
   var driver;
   setup(this, desired).then(function (d) { driver = d; });
 
-  if (env.FAST_TESTS) {
-    beforeEach(function (done) {
-      driver.resetApp()
-        .then(function () { return driver.sleep(3000); })
-        .nodeify(done);
-    });
-  }
-
   // todo fix this: got Error response status: 13, Could not scroll element into view: Views
   it('should bring the element into view @skip-android-all', function (done) {
     driver