merge updates from upstream to master (#1)

* Add eslint and fix problems

* Add androidInstallTimeout capability.

Replace REMOTE_INSTALL_TIMEOUT with androidInstallTimeout capability.

* 1.10.11

* Use correct capability arguments

installApkRemotely to parse correct capabilities from opts

* Honor reset without the app capability

Fixes appium#157

* 1.10.12

Author: spearminty

Diff for: .eslintrc

@@ -0,0 +1,3 @@
+{
+  "extends": "appium"
+}

Diff for: .travis.yml

@@ -1,5 +1,8 @@
 language: node_js
 node_js:
   - "0.12"
+script:
+  - gulp eslint
+  - gulp once
 after_success:
   - gulp coveralls

Diff for: lib/android-helpers.js

@@ -63,8 +63,7 @@ helpers.ensureDeviceLocale = async function (adb, language, country) {
     return;
   }
   let changed = false;
-  if (await adb.getApiLevel() < 23)
-  {
+  if (await adb.getApiLevel() < 23) {
     let curLanguage = await adb.getDeviceLanguage();
     let curCountry = await adb.getDeviceCountry();
     if (haveLanguage && language !== curLanguage) {
@@ -124,9 +123,9 @@ helpers.getDeviceInfoFromCaps = async function (opts = {}) {
                              `of connected devices`);
       }
       emPort = adb.getPortFromEmulatorString(udid);
-    } else if (!!opts.platformVersion) {
+    } else if (opts.platformVersion) {
       // a platform version was given. lets try to find a device with the same os
-      logger.info(`Looking for a device with Android ${opts.platformVersion}`);
+      logger.info(`Looking for a device with Android '${opts.platformVersion}'`);
 
       // in case we fail to find something, give the user a useful log that has
       // the device udids and os versions so they know what's available
@@ -215,7 +214,7 @@ helpers.getRemoteApkPath = function (localApkMd5) {
   return remotePath;
 };
 
-helpers.resetApp = async function (adb, localApkPath, pkg, fastReset) {
+helpers.resetApp = async function (adb, localApkPath, pkg, fastReset, androidInstallTimeout = REMOTE_INSTALL_TIMEOUT) {
   if (fastReset) {
     logger.debug("Running fast reset (stop and clear)");
     await adb.stopAndClear(pkg);
@@ -226,12 +225,12 @@ helpers.resetApp = async function (adb, localApkPath, pkg, fastReset) {
     if (!await adb.fileExists(remotePath)) {
       throw new Error("Can't run slow reset without a remote apk!");
     }
-    await helpers.reinstallRemoteApk(adb, localApkPath, pkg, remotePath);
+    await helpers.reinstallRemoteApk(adb, localApkPath, pkg, remotePath, androidInstallTimeout);
   }
 };
 
 helpers.reinstallRemoteApk = async function (adb, localApkPath, pkg,
-                                             remotePath, tries = 2) {
+                                             remotePath, androidInstallTimeout, tries = 2) {
   await retry(tries, async () => {
     try {
       // first do an uninstall of the package to make sure it's not there
@@ -240,7 +239,7 @@ helpers.reinstallRemoteApk = async function (adb, localApkPath, pkg,
       logger.warn("Uninstalling remote APK failed, maybe it wasn't installed");
     }
     try {
-      await adb.installFromDevicePath(remotePath, {timeout: 90000});
+      await adb.installFromDevicePath(remotePath, {timeout: androidInstallTimeout});
     } catch (e) {
       logger.warn("Installing remote APK failed, going to uninstall and try " +
                   "again");
@@ -253,18 +252,18 @@ helpers.reinstallRemoteApk = async function (adb, localApkPath, pkg,
   });
 };
 
-helpers.installApkRemotely = async function (adb, localApkPath, pkg, fastReset) {
-  let installTimeout = REMOTE_INSTALL_TIMEOUT;
+helpers.installApkRemotely = async function (adb, opts) {
+  let {app, appPackage, fastReset, androidInstallTimeout} = opts;
 
-  let apkMd5 = await fs.md5(localApkPath);
-  let remotePath = await helpers.getRemoteApkPath(apkMd5, localApkPath);
+  let apkMd5 = await fs.md5(app);
+  let remotePath = await helpers.getRemoteApkPath(apkMd5, app);
   let remoteApkExists = await adb.fileExists(remotePath);
   logger.debug("Checking if app is installed");
-  let installed = await adb.isAppInstalled(pkg);
+  let installed = await adb.isAppInstalled(appPackage);
 
   if (installed && remoteApkExists && fastReset) {
     logger.info("Apk is already on remote and installed, resetting");
-    await helpers.resetApp(adb, localApkPath, pkg, fastReset);
+    await helpers.resetApp(adb, app, appPackage, fastReset, androidInstallTimeout);
   } else if (!installed || (!remoteApkExists && fastReset)) {
     if (!installed) {
       logger.info("Apk is not yet installed");
@@ -277,14 +276,14 @@ helpers.installApkRemotely = async function (adb, localApkPath, pkg, fastReset)
     await helpers.removeRemoteApks(adb, [apkMd5]);
     if (!remoteApkExists) {
       // push from local to remote
-      logger.info(`Pushing ${pkg} to device. Will wait up to ${installTimeout} ` +
+      logger.info(`Pushing ${appPackage} to device. Will wait up to ${androidInstallTimeout} ` +
                   `milliseconds before aborting`);
-      await adb.push(localApkPath, remotePath, {timeout: installTimeout});
+      await adb.push(app, remotePath, {timeout: androidInstallTimeout});
     }
 
     // Next, install from the remote path. This can be flakey. If it doesn't
     // work, clear out any cached apks, re-push from local, and try again
-    await helpers.reinstallRemoteApk(adb, localApkPath, pkg, remotePath);
+    await helpers.reinstallRemoteApk(adb, app, appPackage, remotePath, androidInstallTimeout);
   }
 };
 

Diff for: lib/commands/network.js

@@ -78,9 +78,9 @@ commands.toggleFlightMode = async function () {
 };
 
 commands.setGeoLocation = async function (location) {
-   let cmd = ['am', 'startservice', '-e', 'longitude', location.longitude,
-              '-e', 'latitude', location.latitude, 'io.appium.settings/.LocationService'];
-   return await this.adb.shell(cmd);
+  let cmd = ['am', 'startservice', '-e', 'longitude', location.longitude,
+             '-e', 'latitude', location.latitude, 'io.appium.settings/.LocationService'];
+  return await this.adb.shell(cmd);
 };
 
 commands.toggleLocationServices = async function () {

Diff for: lib/desired-caps.js

@@ -31,6 +31,9 @@ let commonCapConstraints = {
   androidDeviceSocket: {
     isString: true
   },
+  androidInstallTimeout: {
+    isNumber: true
+  },
   adbPort: {
     isNumber: true
   },

Diff for: lib/driver.js

@@ -171,7 +171,7 @@ class AndroidDriver extends BaseDriver {
     // unlock the device
     await helpers.unlock(this.adb);
     // If the user sets autoLaunch to false, they are responsible for initAUT() and startAUT()
-    if (!this.appOnDevice && this.opts.autoLaunch) {
+    if (this.opts.autoLaunch) {
       // set up app under test
       await this.initAUT();
     }
@@ -225,15 +225,21 @@ class AndroidDriver extends BaseDriver {
     let launchInfo = await helpers.getLaunchInfo(this.adb, this.opts);
     Object.assign(this.opts, launchInfo);
     Object.assign(this.caps, launchInfo);
-    if (!this.opts.skipUninstall) {
-      await this.adb.uninstallApk(this.opts.appPackage);
-    }
     // install app
     if (!this.opts.app) {
+      if (this.opts.fullReset) {
+        log.errorAndThrow('Full reset requires an app capability, use fastReset if app is not provided');
+      }
       log.debug('No app capability. Assuming it is already on the device');
+      if (this.opts.fastReset) {
+        await helpers.resetApp(this.adb, this.opts.app, this.opts.appPackage, this.opts.fastReset);
+      }
       return;
     }
-    await helpers.installApkRemotely(this.adb, this.opts.app, this.opts.appPackage, this.opts.fastReset);
+    if (!this.opts.skipUninstall) {
+      await this.adb.uninstallApk(this.opts.appPackage);
+    }
+    await helpers.installApkRemotely(this.adb, this.opts);
     this.apkStrings[this.opts.language] = await helpers.pushStrings(
         this.opts.language, this.adb, this.opts);
   }

Diff for: package.json

@@ -9,7 +9,7 @@
     "mobile",
     "mobile testing"
   ],
-  "version": "1.10.10",
+  "version": "1.10.12",
   "author": "appium",
   "license": "Apache-2.0",
   "repository": {
@@ -55,8 +55,14 @@
   "devDependencies": {
     "appium-gulp-plugins": "^1.3.12",
     "appium-test-support": "0.0.5",
+    "babel-eslint": "^6.1.0",
     "chai": "^3.0.0",
     "chai-as-promised": "^5.1.0",
+    "eslint": "^2.13.1",
+    "eslint-config-appium": "0.0.6",
+    "eslint-plugin-babel": "^3.3.0",
+    "eslint-plugin-import": "^1.9.2",
+    "eslint-plugin-mocha": "^3.0.0",
     "gulp": "^3.8.11",
     "sample-apps": "2.0.4",
     "sinon": "^1.16.1",

Diff for: test/functional/android-helper-e2e-specs.js

@@ -4,8 +4,11 @@ import helpers from '../../lib/android-helpers';
 import sampleApps from 'sample-apps';
 import ADB from 'appium-adb';
 
-let apiDemos = sampleApps('ApiDemos-debug');
-let appPackage = 'io.appium.android.apis';
+let opts = {
+  app : sampleApps('ApiDemos-debug'),
+  appPackage : 'io.appium.android.apis',
+  androidInstallTimeout : 90000
+};
 
 chai.should();
 chai.use(chaiAsPromised);
@@ -15,10 +18,10 @@ describe('android-helpers e2e', () => {
     it('installs an apk by pushing it to the device then installing it from within', async function () {
       this.timeout(15000);
       var adb = await ADB.createADB();
-      await adb.uninstallApk(appPackage);
-      await adb.isAppInstalled(appPackage).should.eventually.be.false;
-      await helpers.installApkRemotely(adb, apiDemos, appPackage);
-      await adb.isAppInstalled(appPackage).should.eventually.be.true;
+      await adb.uninstallApk(opts.appPackage);
+      await adb.isAppInstalled(opts.appPackage).should.eventually.be.false;
+      await helpers.installApkRemotely(adb, opts);
+      await adb.isAppInstalled(opts.appPackage).should.eventually.be.true;
     });
   });
   describe('ensureDeviceLocale', () => {

Diff for: test/functional/commands/find/by-accessibility-id-e2e-specs.js

@@ -13,7 +13,7 @@ let defaultCaps = {
   platformName: 'Android'
 };
 
-describe('Find - accessibility ID', function(){
+describe('Find - accessibility ID', function () {
   before(async () => {
     driver = new AndroidDriver();
     await driver.createSession(defaultCaps);

Diff for: test/functional/commands/find/by-id-e2e-specs.js

@@ -13,7 +13,7 @@ let defaultCaps = {
   platformName: 'Android'
 };
 
-describe('Find - ID', function(){
+describe('Find - ID', function () {
   before(async () => {
     driver = new AndroidDriver();
     await driver.createSession(defaultCaps);

Diff for: test/functional/commands/geo-location-e2e-specs.js

@@ -1,7 +1,7 @@
 import chai from 'chai';
 import chaiAsPromised from 'chai-as-promised';
 import { retryInterval } from 'asyncbox';
-import { AndroidDriver } from '../../../..';
+import AndroidDriver from '../../..';
 import sampleApps from 'sample-apps';
 
 

Diff for: test/functional/commands/keyboard-e2e-specs.js

@@ -138,7 +138,7 @@ describe('keyboard', () => {
       // sometimes the default ime is not what we are using
       let engines = await driver.availableIMEEngines();
       let selectedEngine = _.first(engines);
-      for(let engine of engines) {
+      for (let engine of engines) {
         // it seems that the latin ime has `android.inputmethod` in its package name
         if (engine.indexOf('android.inputmethod') !== -1) {
           selectedEngine = engine;

Diff for: test/functional/commands/localization/language-e2e-specs.js

@@ -31,7 +31,7 @@ describe('Localization - language and country @skip-ci @skip-real-device', funct
   });
 });
 
-describe('Localization - locale @skip-ci @skip-real-device', function() {
+describe('Localization - locale @skip-ci @skip-real-device', function () {
   // Stalls on API 23, works in CI
   beforeEach(async () => {
     driver = new AndroidDriver();

Diff for: test/functional/commands/url-e2e-specs.js

@@ -13,7 +13,7 @@ let defaultCaps = {
   platformName: 'Android'
 };
 
-describe('setUrl', function(){
+describe('setUrl', function (){
   before(async () => {
     driver = new AndroidDriver();
     await driver.createSession(defaultCaps);

Diff for: test/functional/driver-e2e-specs.js

@@ -10,7 +10,8 @@ let driver;
 let defaultCaps = {
   app: sampleApps('ApiDemos-debug'),
   deviceName: 'Android',
-  platformName: 'Android'
+  platformName: 'Android',
+  androidInstallTimeout: '90000'
 };
 
 describe('createSession', function () {

Diff for: test/unit/android-helper-specs.js

@@ -271,11 +271,12 @@ describe('Android Helpers', () => {
   describe('resetApp', withMocks({adb, fs, helpers}, (mocks) => {
     const localApkPath = 'local';
     const pkg = 'pkg';
+    const androidInstallTimeout = 90000;
     it('should throw error if remote file does not exist', async () => {
       mocks.fs.expects('md5').withExactArgs(localApkPath).returns('apkmd5');
       mocks.adb.expects('fileExists').returns(false);
       mocks.helpers.expects('reinstallRemoteApk').never();
-      await helpers.resetApp(adb, localApkPath, pkg, false).should.eventually
+      await helpers.resetApp(adb, localApkPath, pkg, false, androidInstallTimeout).should.eventually
         .be.rejectedWith('slow');
       mocks.adb.verify();
       mocks.fs.verify();
@@ -285,7 +286,7 @@ describe('Android Helpers', () => {
       mocks.fs.expects('md5').withExactArgs(localApkPath).returns('apkmd5');
       mocks.adb.expects('fileExists').returns(true);
       mocks.helpers.expects('reinstallRemoteApk').once().returns('');
-      await helpers.resetApp(adb, localApkPath, pkg, false);
+      await helpers.resetApp(adb, localApkPath, pkg, false, androidInstallTimeout);
       mocks.adb.verify();
       mocks.fs.verify();
       mocks.helpers.verify();
@@ -296,39 +297,45 @@ describe('Android Helpers', () => {
     const localApkPath = 'local';
     const pkg = 'pkg';
     const remotePath = 'remote';
+    const androidInstallTimeout = 90000;
     it('should throw error if remote file does not exist', async () => {
       mocks.adb.expects('uninstallApk').withExactArgs(pkg).returns('');
       // install remote is not defines do we mean installApkRemotely?
       mocks.adb.expects('installRemote').withExactArgs(remotePath)
         .returns('');
-      await helpers.reinstallRemoteApk(adb, localApkPath, pkg, remotePath);
+      await helpers.reinstallRemoteApk(adb, localApkPath, pkg, remotePath, androidInstallTimeout);
       mocks.adb.verify();
     });
   }));
   describe('installApkRemotely', withMocks({adb, fs, helpers}, (mocks) => {
-    const localApkPath = 'local';
-    const pkg = 'pkg';
+    //use mock appium capabilities for this test
+    const opts = {
+      app : 'local',
+      appPackage : 'pkg',
+      fastReset : true,
+      androidInstallTimeout : 90000
+    };
     it('should reset app if already installed', async () => {
-      mocks.fs.expects('md5').withExactArgs(localApkPath).returns('apkmd5');
+      mocks.fs.expects('md5').withExactArgs(opts.app).returns('apkmd5');
       mocks.helpers.expects('getRemoteApkPath').returns(false);
       mocks.adb.expects('fileExists').returns(true);
       mocks.adb.expects('isAppInstalled').returns(true);
       mocks.helpers.expects('resetApp').once().returns("");
-      await helpers.installApkRemotely(adb, localApkPath, pkg, true);
+      await helpers.installApkRemotely(adb, opts);
       mocks.adb.verify();
       mocks.fs.verify();
       mocks.helpers.verify();
     });
     it.skip('should push and reinstall apk when apk is not installed', async () => {
-      mocks.fs.expects('md5').withExactArgs(localApkPath).returns('apkmd5');
+      mocks.fs.expects('md5').withExactArgs(opts.app).returns('apkmd5');
       mocks.helpers.expects('getRemoteApkPath').returns(true);
       mocks.adb.expects('fileExists').returns(true);
       mocks.adb.expects('isAppInstalled').returns(true);
       mocks.helpers.expects('resetApp').once().returns("");
       mocks.helpers.expects('reinstallRemoteApk').once().returns("");
       mocks.helpers.expects('removeTempApks').once().returns(true);
       mocks.adb.expects('mkdir').once().returns("");
-      await helpers.installApkRemotely(adb, localApkPath, pkg, true);
+      await helpers.installApkRemotely(adb, opts);
       mocks.adb.verify();
       mocks.fs.verify();
       mocks.helpers.verify();

Diff for: test/unit/commands/context-specs.js

@@ -29,7 +29,7 @@ describe('Context', () => {
   describe('setContext', () => {
     beforeEach(() => {
       driver = new AndroidDriver();
-      sandbox.stub(driver, 'getContexts', function(){ return ['CHROMIUM', 'ANOTHER']; });
+      sandbox.stub(driver, 'getContexts', () => { return ['CHROMIUM', 'ANOTHER']; });
     });
     afterEach(() => {
       sandbox.restore();