fix websocket bug and make sure named apps clobber device in caps

appium · Mar 4, 2014 · 7adcac3 · 7adcac3
1 parent e4e1936
commit 7adcac3
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 9 deletions.
diff --git a/lib/appium.js b/lib/appium.js
@@ -25,7 +25,7 @@ var Appium = function (args) {
   this.args = args;
   this.serverArgs = _.clone(args);
   this.rest = null;
-  this.args.webSocket = null;
+  this.webSocket = null;
   this.deviceType = null;
   this.device = null;
   this.sessionId = null;
@@ -49,7 +49,7 @@ Appium.prototype.attachTo = function (rest) {
 };
 
 Appium.prototype.attachSocket = function (webSocket) {
-  this.args.webSocket = webSocket;
+  this.webSocket = webSocket;
 };
 
 Appium.prototype.registerConfig = function (configObj) {
@@ -77,6 +77,7 @@ Appium.prototype.preLaunch = function (cb) {
 
 Appium.prototype.start = function (desiredCaps, cb) {
   this.desiredCapabilities = desiredCaps;
+  this.args.webSocket = this.webSocket; // allow to persist over many sessions
   if (this.sessionId === null || this.sessionOverride) {
     this.configure(this.args, desiredCaps, function (err) {
       if (err) {
@@ -94,6 +95,7 @@ Appium.prototype.start = function (desiredCaps, cb) {
 
 Appium.prototype.getDeviceType = function (args, caps) {
   var type = this.getDeviceTypeFromArgs(args) ||
+             this.getDeviceTypeFromNamedApp(args.app || caps.app) ||
              this.getDeviceTypeFromDeviceCap(caps.device) ||
              this.getDeviceTypeFromApp(args.app || caps.app) ||
              this.getDeviceTypeFromPackage(args.androidPackage ||
@@ -120,12 +122,8 @@ Appium.prototype.getDeviceTypeFromDeviceCap = function (device) {
   }
 };
 
-Appium.prototype.getDeviceTypeFromApp = function (app) {
-  if (/\.app$/.test(app) || /\.app\.zip$/.test(app)) {
-    return DT_IOS;
-  } else if (/\.apk$/.test(app) || /\.apk\.zip$/.test(app)) {
-    return DT_ANDROID;
-  } else if ((app && app.toLowerCase() === "safari")) {
+Appium.prototype.getDeviceTypeFromNamedApp = function (app) {
+  if ((app && app.toLowerCase() === "safari")) {
     return DT_SAFARI;
   } else if ((app && app.toLowerCase() === "settings")) {
     return DT_IOS;
@@ -134,6 +132,14 @@ Appium.prototype.getDeviceTypeFromApp = function (app) {
   }
 };
 
+Appium.prototype.getDeviceTypeFromApp = function (app) {
+  if (/\.app$/.test(app) || /\.app\.zip$/.test(app)) {
+    return DT_IOS;
+  } else if (/\.apk$/.test(app) || /\.apk\.zip$/.test(app)) {
+    return DT_ANDROID;
+  }
+};
+
 Appium.prototype.getDeviceTypeFromPackage = function (pkg) {
   var chromePkgs = [
     "com.android.chrome"

diff --git a/lib/devices/android/uiautomator.js b/lib/devices/android/uiautomator.js
@@ -205,7 +205,7 @@ UiAutomator.prototype.handleBootstrapOutput = function (output) {
         logger.info(log);
       }
     }
-  }, this);
+  }.bind(this));
 };
 
 UiAutomator.prototype.errorStreamHandler = function (output) {

diff --git a/test/functional/android/chrome-specs.js b/test/functional/android/chrome-specs.js
@@ -1,5 +1,6 @@
 "use strict";
 
+process.env.DEVICE = process.env.DEVICE || "android";
 describe("chrome", function () {
   require('../common/webview-base')('chromium');
 });
diff --git a/test/unit/configuration-specs.js b/test/unit/configuration-specs.js
@@ -27,6 +27,7 @@ describe('Appium', function () {
     , [{}, {app: 'settings'}, 'ios']
     , [{}, {app: 'chrome'}, 'chrome']
     , [{}, {app: 'chromium'}, 'chrome']
+    , [{}, {app: 'chromium', device: 'android'}, 'chrome']
     , [{}, {app: 'browser'}, 'chrome']
     , [{}, {app: 'http://www.site.com/my.app.zip'}, 'ios']
     , [{}, {app: 'http://www.site.com/my.apk.zip'}, 'android']