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

Fix iOS context switch

Browse Source
This commit is contained in:
Isaac Murchie
2014-04-29 10:06:58 -07:00
parent 567ffa2f47
commit aea4a3e08a
2 changed files with 63 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
lib/devices/ios/ios-controller.js
View File

@@ -1488,46 +1488,52 @@ iOSController.setContext = function (name, cb, skipReadyCheck) {
}
} else {
var idx = name.replace(WEBVIEW_BASE, '');
if (_.contains(this.contexts, idx)) {
var pageIdKey = parseInt(idx, 10);
var next = function () {
this.processingRemoteCmd = true;
if (this.args.udid === null) {
this.remote.selectPage(pageIdKey, function () {
this.curContext = idx;
cb(null, {
status: status.codes.Success.code
, value: ''
});
this.processingRemoteCmd = false;
}.bind(this), skipReadyCheck);
} else {
if (name === this.curContext) {
logger.info("Remote debugger is already connected to window [" + name + "]");
cb(null, {
status: status.codes.Success.code
, value: name
});
} else {
this.remote.disconnect(function () {
this.curContext = idx;
this.remote.connect(idx, function () {
cb(null, {
status: status.codes.Success.code
, value: name
});
});
}.bind(this));
}
}
}.bind(this);
next();
} else {
cb(null, {
status: status.codes.NoSuchContext.code
, value: "Context '" + name + "' does not exist"
});
if (idx === WEBVIEW_WIN) {
// allow user to pass in "WEBVIEW" without an index
idx = '1';
}
this.getContexts(function () {
if (_.contains(this.contexts, idx)) {
var pageIdKey = parseInt(idx, 10);
var next = function () {
this.processingRemoteCmd = true;
if (this.args.udid === null) {
this.remote.selectPage(pageIdKey, function () {
this.curContext = idx;
cb(null, {
status: status.codes.Success.code
, value: ''
});
this.processingRemoteCmd = false;
}.bind(this), skipReadyCheck);
} else {
if (name === this.curContext) {
logger.info("Remote debugger is already connected to window [" + name + "]");
cb(null, {
status: status.codes.Success.code
, value: name
});
} else {
this.remote.disconnect(function () {
this.curContext = idx;
this.remote.connect(idx, function () {
cb(null, {
status: status.codes.Success.code
, value: name
});
});
}.bind(this));
}
}
}.bind(this);
next();
} else {
cb(null, {
status: status.codes.NoSuchContext.code
, value: "Context '" + name + "' does not exist"
});
}
}.bind(this));
}
};

18
test/functional/ios/webview/webview-specs.js
View File

@@ -42,6 +42,24 @@ describe('webview - webview -', function () {
.should.eventually.equal("Google")
.nodeify(done);
});
it('setting context to \'WEBVIEW_1\' should work without first getting contexts', function (done) {
driver
.context("WEBVIEW_1")
.get("http://google.com")
.sleep(500)
.title()
.should.eventually.equal("Google")
.nodeify(done);
});
it('setting context to \'WEBVIEW\' should work', function (done) {
driver
.context("WEBVIEW")
.get("http://google.com")
.sleep(500)
.title()
.should.eventually.equal("Google")
.nodeify(done);
});
it('setting context to \'null\' should work', function (done) {
driver.contexts().then(function (ctxs) {
ctxs.length.should.be.above(0);