Do not prefer unprefixed chromeOptions

appium · Dec 27, 2017 · 8bb5a13 · 8bb5a13
1 parent 8770290
commit 8bb5a13
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 25 deletions.
diff --git a/lib/commands/context.js b/lib/commands/context.js
@@ -212,20 +212,18 @@ async function setupNewChromedriver (opts, curDeviceId, adb) {
   };
   let chromedriver = new Chromedriver(chromeArgs);
 
-  // prefer `chromeOptions` capability
-  if (!opts.chromeOptions) {
-    // try out any prefixed chromeOptions,
-    // and strip the prefix
-    opts.chromeOptions = {};
-    for (let opt of _.keys(opts)) {
-      if (opt.includes('chromeOptions')) {
-        logger.warn(`Merging '${opt}' into 'chromeOptions'. This may cause unexpected behavior`);
-        _.merge(opts.chromeOptions, opts[opt]);
-      }
+  // make sure there are chromeOptions
+  opts.chromeOptions = opts.chromeOptions || {};
+  // try out any prefixed chromeOptions,
+  // and strip the prefix
+  for (let opt of _.keys(opts)) {
+    if (opt.includes(':chromeOptions')) {
+      logger.warn(`Merging '${opt}' into 'chromeOptions'. This may cause unexpected behavior`);
+      _.merge(opts.chromeOptions, opts[opt]);
     }
   }
 
-  let appPackage = (opts.chromeOptions && opts.chromeOptions.androidPackage) || opts.appPackage;
+  let appPackage = opts.chromeOptions.androidPackage || opts.appPackage;
   let caps = {
     chromeOptions: {
       androidPackage: appPackage,

diff --git a/test/unit/commands/context-specs.js b/test/unit/commands/context-specs.js
@@ -237,31 +237,22 @@ describe('Context', function () {
       chromedriver.start.getCall(0).args[0].chromeOptions.androidPackage
         .should.be.equal('apkg');
     });
-    it('should prefer unprefixed chromeOptions', async function () {
+    it('should use prefixed chromeOptions', async function () {
       let chromedriver = await setupNewChromedriver({
-        chromeOptions: {
-          androidPackage: 'apkg',
-        },
         'goog:chromeOptions': {
-          androidPackage: 'bpkg',
+          androidPackage: 'apkg',
         },
       });
       chromedriver.start.getCall(0).args[0].chromeOptions.androidPackage
         .should.be.equal('apkg');
     });
-    it('should use prefixed chromeOptions if necessary', async function () {
+    it('should merge chromeOptions', async function () {
       let chromedriver = await setupNewChromedriver({
-        'goog:chromeOptions': {
+        chromeOptions: {
           androidPackage: 'apkg',
         },
-      });
-      chromedriver.start.getCall(0).args[0].chromeOptions.androidPackage
-        .should.be.equal('apkg');
-    });
-    it('should merge prefixed chromeOptions if necessary', async function () {
-      let chromedriver = await setupNewChromedriver({
         'goog:chromeOptions': {
-          androidPackage: 'apkg',
+          androidWaitPackage: 'bpkg',
         },
         'appium:chromeOptions': {
           androidActivity: 'aact',
@@ -271,6 +262,8 @@ describe('Context', function () {
         .should.be.equal('apkg');
       chromedriver.start.getCall(0).args[0].chromeOptions.androidActivity
         .should.be.equal('aact');
+      chromedriver.start.getCall(0).args[0].chromeOptions.androidWaitPackage
+        .should.be.equal('bpkg');
     });
     it('should be able to set androidActivity chrome option', async function () {
       let chromedriver = await setupNewChromedriver({chromeAndroidActivity: 'act'});