allow automation of chrome beta

CHANGELOG.txt

@@ -24,8 +24,8 @@ CHANGES IN VERSION 1.1.0 (from 1.0.0)
 - extract strings from apk corresponding to device language instead of default
   to be used with ID locator strategy
 - update complex find with new uiautomator constants
-- fix issue when passing in multiple avdArgs
-- uninstall before installing remote apk
+- upgrade Chromedriver to 2.10
+- allow automation of Chrome Beta with browserName: `ChromeBeta`
 
 #### Selendroid
 - update selendroid to 0.10.0

lib/appium.js

@@ -171,7 +171,7 @@ Appium.prototype.getDeviceTypeFromAutomationName = function (automation) {
 Appium.prototype.getDeviceTypeFromBrowserName = function (browser) {
   if (browser === "safari") {
     return DT_SAFARI;
-  } else if (_.contains(["chrome", "chromium", "browser"], browser)) {
+  } else if (_.contains(["chrome", "chromium", "chromebeta", "browser"], browser)) {
     return DT_CHROME;
   }
 };
@@ -212,7 +212,7 @@ Appium.prototype.getDeviceTypeFromNamedApp = function (app) {
     return DT_SAFARI;
   } else if (app === "settings") {
     return DT_IOS;
-  } else if (_.contains(["chrome", "chromium", "browser"], app)) {
+  } else if (_.contains(["chrome", "chromium", "chromebeta", "browser"], app)) {
     return DT_CHROME;
   }
 };
@@ -228,6 +228,7 @@ Appium.prototype.getDeviceTypeFromApp = function (app) {
 Appium.prototype.getDeviceTypeFromPackage = function (pkg) {
   var chromePkgs = [
     "com.android.chrome"
+  , "com.chrome.beta"
   , "org.chromium.chrome.testshell"
   , "com.android.browser"
   ];

lib/devices/android/chrome.js

@@ -30,6 +30,9 @@ ChromeAndroid.prototype.configure = function (args, caps, cb) {
   if (app === "chromium") {
     this.args.androidPackage = "org.chromium.chrome.testshell";
     this.args.androidActivity = "org.chromium.chrome.testshell.Main";
+  } else if (app === "chromebeta") {
+    this.args.androidPackage = "com.chrome.beta";
+    this.args.androidActivity = "com.google.android.apps.chrome.Main";
   } else if (app === "browser") {
     this.args.androidPackage = "com.android.browser";
     this.args.androidActivity = "com.android.browser.BrowserActivity";
@@ -92,7 +95,8 @@ ChromeAndroid.prototype.createSession = function (cb) {
       androidActivity: this.args.appActivity
     }
   };
-  var knownPackages = ["org.chromium.chrome.testshell", "com.android.chrome"];
+  var knownPackages = ["org.chromium.chrome.testshell", "com.android.chrome",
+                       "com.chrome.beta"];
   if (_.contains(knownPackages, this.args.appPackage)) {
     delete caps.chromeOptions.androidActivity;
   }

test/functional/android/chrome/desired.js

@@ -1,4 +1,4 @@
 module.exports = {
-  browserName: 'chrome',
+  browserName: process.env.BROWSER_NAME || 'chrome',
   enablePerformanceLogging: true
 };

test/helpers/webview.js

@@ -23,7 +23,7 @@ var loadWebView = function (desired, browser, urlToLoad, titleToSpin) {
 
   var uuid = uuidGenerator.v1();
   if (typeof urlToLoad === "undefined") {
-    if (app === "chrome" || app === "chromium") {
+    if (app === "chrome" || app === "chromium" || app === "chromebeta") {
       urlToLoad = env.CHROME_GUINEA_TEST_END_POINT + '?' + uuid;
     } else {
       urlToLoad = env.GUINEA_TEST_END_POINT + '?' + uuid;
@@ -32,7 +32,7 @@ var loadWebView = function (desired, browser, urlToLoad, titleToSpin) {
   if (typeof titleToSpin === "undefined") {
     titleToSpin = uuid;
   }
-  if (_.contains(["safari", "iwebview", "chrome", "chromium"], app)) {
+  if (_.contains(["safari", "iwebview", "chrome", "chromium", "chromebeta"], app)) {
     return browser
       .get(urlToLoad)
       .then(function () { return spinTitle(titleToSpin, browser); });
@@ -59,8 +59,9 @@ var loadWebView = function (desired, browser, urlToLoad, titleToSpin) {
 
 
 var isChrome = function (desired) {
-  return desired.app === "chrome" || desired.app === "chromium" ||
-    desired.browserName === "chrome" || desired.browserName === "chromium";
+  var chromes = ["chrome", "chromium", "chromebeta"];
+  return _.contains(chromes, desired.app) ||
+         _.contains(chromes, desired.browserName);
 };
 
 function skip(reason, done) {

test/unit/configuration-specs.js

@@ -36,7 +36,8 @@ describe('Appium', function () {
         var browserCapabilities = [
             [{}, {platformName: 'ios', browserName: 'Safari'}, 'safari']
           , [{}, {platformName: 'Android', browserName: 'Chrome'}, 'chrome']
-          , [{}, {platformName: 'Android', browserName: 'Chromium'}, 'chrome']
+          , [{}, {platformName: 'Android', browserName: 'ChromeBeta'}, 'chrome']
+          , [{}, {platformName: 'Android', browserName: 'chromebeta'}, 'chrome']
           , [{}, {platformName: 'Android', browserName: 'browser'}, 'chrome']
           , [{browserName: 'browser'}, {platformName: 'Android'}, 'chrome']
           , [{browserName: 'Safari'}, {platformName: 'ios'}, 'safari']
@@ -85,6 +86,7 @@ describe('Appium', function () {
         , [{}, {app: 'Settings'}, 'ios']
         , [{}, {app: 'chrome'}, 'chrome']
         , [{}, {app: 'chromium'}, 'chrome']
+        , [{}, {app: 'chromebeta'}, 'chrome']
         , [{}, {app: 'browser'}, 'chrome']
         , [{}, {app: 'http://www.site.com/my.app.zip'}, 'ios']
         , [{}, {app: 'http://www.site.com/MY.APP.ZIp'}, 'ios']