mirror/appium
1
0
Fork 0
mirror of https://github.com/appium/appium.git synced 2026-04-26 13:28:43 -05:00
Code Issues Packages Projects Releases Wiki Activity

Handle node-idevice callback parameter types for isInstalled.

Browse Source 
This handles #4915.

Node package `node-idevice` has a method on the `IDevice` class
that checks to see if a given app is installed: `isInstalled`.
This method passes a boolean value as the second argument in the
callback function, but `isAppInstalled` expects an array.

The array support appears to be necessary for some other opaque
types so it cannot be removed.  Instead, we check the type of the
second parameter.  If it's `boolean` and `true` then we execute
the positive portion of the if block.
This commit is contained in:
Robert S. Jones
2015-04-14 21:43:45 -07:00
parent 230dc70f80
commit f5a04fdcc0
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/server/controller.js
+9 -3
View File
@@ -108,15 +108,21 @@ exports.removeApp = function (req, res) {
}
};
// TODO: fix this method so it expects a callback with a boolean value, not
// some weird stdout thing
exports.isAppInstalled = function (req, res) {
if (checkMissingParams(req, res, {bundleId: req.body.bundleId}, true)) {
req.device.isAppInstalled(req.body.bundleId, function (error, stdout) {
if (error !== null) {
respondSuccess(req, res, false);
} else {
if ((req.appium.args.udid && req.appium.args.udid.length === 40) || (typeof stdout[0] !== "undefined")) {
// We're examining the type of stdout because `isAppInstalled` uses
// node-idevice for real iOS devices. node-idevice passes a boolean
// value in the second parameter of the callback function. Other
// functions pass back an array. Changing the parameter type of the
// other functions is a deeper and more dangerous change than just
// type-checking here.
if ((req.appium.args.udid && req.appium.args.udid.length === 40) ||
(typeof stdout === "boolean" && stdout) ||
(typeof stdout[0] !== "undefined")) {
respondSuccess(req, res, true);
} else {
respondSuccess(req, res, false);