Merge pull request #4 from macacajs/support-launch

support launch from package name
macacajs · Apr 6, 2016 · 0cea58d · 0cea58d
2 parents ed31f91 + ccb8302
commit 0cea58d
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/lib/helper.js b/lib/helper.js
@@ -13,7 +13,9 @@
 
 'use strict';
 
-const _ = require('macaca-utils');
+const macacaUtils = require('macaca-utils');
+
+var _ = macacaUtils.merge({}, macacaUtils);
 
 _.sleep = function(ms) {
   return new Promise((resolve, reject) => {

diff --git a/lib/macaca-android.js b/lib/macaca-android.js
@@ -107,7 +107,14 @@ Android.prototype.initDevice = function *() {
 };
 
 Android.prototype.getApkInfo = function *() {
-  this.apkInfo = yield ADB.getApkMainifest(this.args.app);
+  if (this.args.package && this.args.activity) {
+    this.apkInfo = {
+      package: this.args.package,
+      activity: this.args.activity
+    };
+  } else {
+    this.apkInfo = yield ADB.getApkMainifest(this.args.app);
+  }
 };
 
 Android.prototype.unlock = function *() {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "macaca-android",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "macaca android",
   "keywords": [
     "android"

diff --git a/test/macaca-android.test.js b/test/macaca-android.test.js
@@ -16,5 +16,7 @@
 var Android = require('..');
 
 describe('test', function() {
-
+  it('should be ok', function() {
+    Android.should.be.ok;
+  });
 });