refactor(protractor): simplify setting specs

qlik-oss · Jan 21, 2019 · 427288b · 427288b
1 parent 75c5958
commit 427288b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 13 deletions.
diff --git a/commands/protractor/src/config.js b/commands/protractor/src/config.js
@@ -380,6 +380,7 @@ const { argv } = yargs
     }
     return config;
   })
+  .coerce('specs', a => globby.sync(a).map(p => path.resolve(p)))
   .coerce('babel', utils.coerceBabel);
 
 argv.shouldInstrument = () => false;
@@ -392,17 +393,6 @@ if (argv.hookRequire) {
 }
 
 argv.require.map(require);
-if (
-  (!argv.multiCapabilities
-    || (argv.multiCapabilities && argv.multiCapabilities.length === 0))
-  && (!argv.specs || (argv.specs && argv.specs.length === 0))
-  && argv.glob.length
-) {
-  const specs = utils
-    .filter(argv.filter.protractor.files, globby.sync(argv.glob))
-    .map(s => path.resolve(s));
-  argv.specs = specs;
-}
 
 // We need to change this relative to this config file so protractor can find it
 if (argv.seleniumServerJar) {

diff --git a/commands/protractor/src/options.js b/commands/protractor/src/options.js
@@ -15,9 +15,9 @@ module.exports = {
   },
   test: {
     description: 'Glob pattern',
-    type: 'string',
+    type: 'array',
     default: TEST_GLOB,
-    alias: ['glob'],
+    alias: ['glob', 'specs'],
   },
   coverage: {
     description: 'Generate coverage',