mirror/appium
1
0
Fork 0
mirror of https://github.com/appium/appium.git synced 2026-02-09 03:09:02 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1836 from jlipps/master

Browse Source 
make sure we don't send status objects back to appium#start (fix #1706)
This commit is contained in:
Jonathan Lipps
2014-01-30 16:51:45 -08:00
parent c515951811 080d792a40
commit a8b7d1d57a
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/devices/ios/safari.js
View File

@@ -2,6 +2,7 @@
var IOS = require('./ios.js')
, logger = require('../../server/logger.js').get('appium')
, status = require("../../server/status.js")
, _ = require('underscore');
var Safari = function (args) {
@@ -58,9 +59,13 @@ Safari.prototype.navToLatestAvailableWebview = function (cb) {
if (parseInt(this.iOSSDKVersion, 10) >= 7 && !this.udid) {
logger.info("We're on iOS7 simulator: clicking apple button to get into a webview");
this.findAndAct('xpath', '//window[2]/scrollview[1]/button[1]', 0, 'click', [], function (err, res) {
if (this.checkSuccess(err, res, cb)) {
navToView();
if (err || res.status !== status.codes.Success.code) {
var msg = "Could not successfully navigate to a working Safari " +
"webview. Original error: " + (err ? err.message : "unknown");
logger.error(msg);
return cb(new Error(msg));
}
navToView();
}.bind(this));
} else {
navToView();