supprt browser

macacajs · May 3, 2016 · 8471f4e · 8471f4e
1 parent fed81a6
commit 8471f4e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/lib/macaca-android.js b/lib/macaca-android.js
@@ -13,7 +13,6 @@ const errors = require('webdriver-dfn-error-code').errors;
 const _ = require('./helper');
 const logger = require('./logger');
 const controllers = require('./controllers');
-
 const WEBVIEW = 'WEBVIEW';
 
 class Android extends DriverBase {
@@ -27,21 +26,27 @@ class Android extends DriverBase {
     this.proxy = null;
     this.udid = null;
     this.uiautomator = null;
+    this.isChrome = null;
     this.contexts = [];
   }
 }
 
 Android.prototype.startDevice = function *(caps) {
   this.args = _.clone(caps);
+  this.isChrome = this.args.browserName && this.args.browserName.toLowerCase() === 'chrome';
   yield JAVA.getVersion();
   this.initAdb();
   yield this.initDevice();
-  yield this.getApkInfo();
   yield this.initUiautomator();
+  yield this.getApkInfo();
   yield this.adb.install(UnlockApk.apkPath);
   yield this.unlock();
   yield this.launchApk();
   yield this.waitActivityReady();
+
+  if (this.isChrome) {
+    yield this.getWebviews();
+  }
 };
 
 Android.prototype.stopDevice = function() {
@@ -132,6 +137,14 @@ Android.prototype.initDevice = function *() {
 };
 
 Android.prototype.getApkInfo = function *() {
+
+  if (this.isChrome) {
+    return this.apkInfo = {
+      package: 'com.android.browser',
+      activity: '.BrowserActivity'
+    }
+  }
+
   if (this.args.package && this.args.activity) {
     this.apkInfo = {
       package: this.args.package,

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "macaca-android",
-  "version": "1.0.9",
+  "version": "1.0.10",
   "description": "Macaca Android driver",
   "keywords": [
     "android"