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

Fix iOS id

Browse Source 
Selector override must happen outside the doFind function. If it's left inside
doFind, then waitForCondition will cause selector to be undefined.
This commit is contained in:
bootstraponline
2013-09-09 15:17:15 -04:00
parent a24ae5b669
commit be30dee179
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/ios.js
View File

@@ -723,6 +723,12 @@ IOS.prototype.findUIElementOrElements = function(strategy, selector, ctx, many,
ctx = escapeSpecialChars(ctx, "'");
ctx = ", '" + ctx + "'";
}
if (strategy === "id") {
var strings = this.localizableStrings;
if (strings && strings.length >= 1) selector = strings[0][selector];
}
var doFind = function(findCb) {
var ext = many ? 's' : '';
@@ -732,10 +738,6 @@ IOS.prototype.findUIElementOrElements = function(strategy, selector, ctx, many,
} else if (strategy === "xpath") {
command = ["au.getElement", ext, "ByXpath('", selector, "'", ctx, ")"].join('');
} else if (strategy === "id") {
var strings = this.localizableStrings;
if (strings && strings.length >= 1) selector = strings[0][selector];
// Prefer an exact match. Some apps, such as uicatalog, don't use exact
// matches so contains is required.
command = ["var exact = au.mainApp.getFirstWithPredicateWeighted(\"name == '", selector,
"' || label == '", selector, "' || value == '", selector, "'\");"].join('');
command += ["exact && exact.status == 0 ? exact : au.mainApp.getFirstWith",