From b70dc24eeca3ea7d1f9d993954850ded07950ea3 Mon Sep 17 00:00:00 2001 From: Vitalii Grygoruk Date: Mon, 31 Mar 2014 23:39:19 +0200 Subject: [PATCH] Mised toLowerCase for iOS.js (+2 squashed commits) Squashed commits: [fba9410] Making sure toLowerCase() is still used for chrome.js [0cbfa68] We don't need toLowerCas() for app argument, as it is used for passing CFBundleIdentifier, fixes #2131 --- lib/devices/android/chrome.js | 2 +- lib/devices/device.js | 2 +- lib/devices/ios/ios.js | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/devices/android/chrome.js b/lib/devices/android/chrome.js index e72a62a50b8..88aa5a12780 100644 --- a/lib/devices/android/chrome.js +++ b/lib/devices/android/chrome.js @@ -24,7 +24,7 @@ ChromeAndroid.prototype.init = function () { ChromeAndroid.prototype.configure = function (args, caps, cb) { logger.info("Looks like we want chrome on android"); this._deviceConfigure(args, caps); - var app = this.appString(); + var app = this.appString().toLowerCase(); if (app === "chromium") { this.args.androidPackage = "org.chromium.chrome.testshell"; this.args.androidActivity = "org.chromium.chrome.testshell.Main"; diff --git a/lib/devices/device.js b/lib/devices/device.js index 3a6c76a0084..041082d3c80 100644 --- a/lib/devices/device.js +++ b/lib/devices/device.js @@ -36,7 +36,7 @@ Device.prototype.setArgFromCap = function (arg, cap) { }; Device.prototype.appString = function () { - return this.args.app ? this.args.app.toString().toLowerCase() : ''; + return this.args.app ? this.args.app.toString() : ''; }; Device.prototype.configureApp = function (cb) { diff --git a/lib/devices/ios/ios.js b/lib/devices/ios/ios.js index c18268c28c1..6fd37f69b1b 100644 --- a/lib/devices/ios/ios.js +++ b/lib/devices/ios/ios.js @@ -136,12 +136,12 @@ IOS.prototype.configureApp = function (cb) { this._deviceConfigureApp(function (err) { var app = this.appString(); if (err) { - if (app === "iwebview") { + if (app.toLowerCase() === "iwebview") { this.capabilities.iwebview = true; this.args.app = path.resolve(__dirname, "../../../build/WebViewApp/WebViewApp.app"); return this.configureLocalApp(cb); - } else if (app === "settings") { + } else if (app.toLowerCase() === "settings") { return this.configurePreferences(cb); } else if (this.appIsPackageOrBundle(app)) { // we have a bundle ID