make sure we can do forceiPad and safari

heads up @DylanLacey, this will likely cause a conflict with your work
appium · Mar 14, 2014 · 873d2df · 873d2df
1 parent 101dec6
commit 873d2df
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/lib/appium.js b/lib/appium.js
@@ -98,8 +98,8 @@ Appium.prototype.getDeviceType = function (args, caps) {
   var device = caps.device ? caps.device.toString().toLowerCase() : '';
   var pkg = args.androidPackage || caps['app-package'];
   pkg = pkg ? pkg.toString().toLowerCase() : '';
-  var type = this.getDeviceTypeFromArgs(args) ||
-             this.getDeviceTypeFromNamedApp(app) ||
+  var type = this.getDeviceTypeFromNamedApp(app) ||
+             this.getDeviceTypeFromArgs(args) ||
              this.getDeviceTypeFromDeviceCap(device) ||
              this.getDeviceTypeFromApp(app) ||
              this.getDeviceTypeFromPackage(pkg);

diff --git a/test/unit/configuration-specs.js b/test/unit/configuration-specs.js
@@ -21,6 +21,7 @@ describe('Appium', function () {
       , [{safari: true}, {}, 'safari']
       , [{safari: true}, {app: '/path/to/my.apk'}, 'safari']
       , [{safari: false}, {app: 'safari'}, 'safari']
+      , [{forceIpad: true}, {app: 'safari'}, 'safari']
       , [{}, {app: 'Safari'}, 'safari']
       , [{}, {app: 'settings'}, 'ios']
       , [{}, {app: 'Settings'}, 'ios']