allow safari on ipad to launch correctly as well

appium · Dec 19, 2013 · e8a685d · e8a685d
1 parent 06e7112
commit e8a685d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/lib/devices/ios/ios-controller.js b/lib/devices/ios/ios-controller.js
@@ -1133,7 +1133,7 @@ iOSController.getWindowHandles = function(cb) {
   }.bind(this));
 };
 
-iOSController.setWindow = function(name, cb) {
+iOSController.setWindow = function(name, cb, skipReadyCheck) {
   if (_.contains(_.pluck(this.windowHandleCache, 'id'), name)) {
     var pageIdKey = parseInt(name, 10);
     var next = function() {
@@ -1146,7 +1146,7 @@ iOSController.setWindow = function(name, cb) {
             , value: ''
           });
           this.processingRemoteCmd = false;
-        }.bind(this));
+        }.bind(this), skipReadyCheck);
       } else {
         if (name == this.curWindowHandle){
           logger.info("Remote debugger is already connected to window [" + name + "]");

diff --git a/lib/devices/ios/safari.js b/lib/devices/ios/safari.js
@@ -30,8 +30,11 @@ Safari.prototype.navToInitialWebview = function(cb) {
 };
 
 Safari.prototype.navToLatestAvailableWebview = function(cb) {
+  var isiPhone = this.getDeviceString().toLowerCase().indexOf("ipad") === -1;
   logger.info("Navigating to most recently opened webview");
-  this.complexTap(1, 1, 0.4, 0.14, 0.23, null, function() {
+  var x = isiPhone ? 0.14 : 0.24;
+  var y = isiPhone ? 0.23 : 0.13;
+  this.complexTap(1, 1, 0.4, x, y, null, function() {
     var start = Date.now();
     var spinHandles = function() {
       this.getWindowHandles(function(err, res) {
@@ -49,7 +52,7 @@ Safari.prototype.navToLatestAvailableWebview = function(cb) {
             if (err) return cb(err);
             this.remote.cancelPageLoad();
             cb();
-          }.bind(this));
+          }.bind(this), true);
         }
       }.bind(this));
     }.bind(this);