@wdio/config 7.25.4 → 7.26.0

package/build/lib/ConfigParser.d.ts

@@ -34,9 +34,10 @@ export default class ConfigParser {
      */
     addService(service: Services.Hooks): void;
     /**
-     * get excluded files from config pattern
+     * determine what specs to run based on the spec(s), suite(s), exclude
+     * attributes from CLI, config and capabilities
      */
-    getSpecs(capSpecs?: string[], capExclude?: string[]): Spec[];
+    getSpecs(capSpecs?: Spec[], capExclude?: Spec[]): Spec[];
     /**
      * sets config attribute with file paths from filtering
      * options from cli argument
@@ -58,10 +59,10 @@ export default class ConfigParser {
     /**
      * returns a flattened list of globbed files
      *
-     * @param  {String[] | String[][]} filenames list of files to glob
-     * @param  {Boolean} flag to indicate omission of warnings
-     * @param  {FileSystemPathService} file system path service for expanding globbed file names
-     * @param  {number} hierarchy depth to prevent recursive calling beyond a depth of 1
+     * @param  {String[] | String[][]} patterns list of files to glob
+     * @param  {Boolean} omitWarnings to indicate omission of warnings
+     * @param  {FileSystemPathService} findAndGlob system path service for expanding globbed file names
+     * @param  {number} hierarchyDepth depth to prevent recursive calling beyond a depth of 1
      * @return {String[] | String[][]} list of files
      */
     static getFilePaths(patterns: Spec[], omitWarnings?: boolean, findAndGlob?: PathService, hierarchyDepth?: number): Spec[];

package/build/lib/ConfigParser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ConfigParser.d.ts","sourceRoot":"","sources":["../../src/lib/ConfigParser.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AAWlE,OAAO,KAAK,EAAE,WAAW,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAA;AAKjE,aAAK,IAAI,GAAG,MAAM,GAAG,MAAM,EAAE,CAAA;AAE7B,UAAU,+BAAgC,SAAQ,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,cAAc,CAAC;IACtF,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,IAAI,CAAC,EAAE,MAAM,EAAE,CAAA;IACf,KAAK,CAAC,EAAE,MAAM,EAAE,CAAA;IAChB,YAAY,CAAC,EAAE,YAAY,CAAC,kBAAkB,CAAA;CACjD;AAED,UAAU,WAAY,SAAQ,IAAI,CAAC,OAAO,CAAC,+BAA+B,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAC7F,KAAK,CAAC,EAAE,IAAI,EAAE,CAAA;IACd,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;CACrB;AAED,MAAM,CAAC,OAAO,OAAO,YAAY;IAKzB,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,qBAAqB;IALjC,OAAO,CAAC,OAAO,CAAqD;IACpE,OAAO,CAAC,aAAa,CAAsC;gBAG/C,YAAY,GAAE,WAAyC,EACvD,qBAAqB,GAAE,oBAA2C;IAI9E,WAAW;IASX;;;OAGG;IACH,aAAa,CAAC,QAAQ,EAAE,MAAM;IA+C9B;;;OAGG;IACH,KAAK,CAAC,MAAM,GAAE,WAAgB;IAwC9B;;;OAGG;IACH,UAAU,CAAC,OAAO,EAAE,QAAQ,CAAC,KAAK;IAkClC;;OAEG;IACH,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,EAAE,UAAU,CAAC,EAAE,MAAM,EAAE;IA2DnD;;;;;;;;OAQG;IACH,0BAA0B,CAAC,cAAc,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE;IAqCnE;;OAEG;IACH,SAAS;IAIT;;OAEG;IACH,eAAe,CAAC,CAAC,CAAC,EAAE,MAAM;IAQ1B;;;;;;;;OAQG;IACH,MAAM,CAAC,YAAY,CAAC,QAAQ,EAAE,IAAI,EAAE,EAAE,YAAY,CAAC,EAAE,OAAO,EAAE,WAAW,GAAE,WAAyC,EAAE,cAAc,CAAC,EAAE,MAAM;IAgD7I;;;;;;OAMG;IACH,WAAW,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE;CAU/C"}
+{"version":3,"file":"ConfigParser.d.ts","sourceRoot":"","sources":["../../src/lib/ConfigParser.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AAWlE,OAAO,KAAK,EAAE,WAAW,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAA;AAKjE,aAAK,IAAI,GAAG,MAAM,GAAG,MAAM,EAAE,CAAA;AAE7B,UAAU,+BAAgC,SAAQ,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,cAAc,CAAC;IACtF,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,IAAI,CAAC,EAAE,MAAM,EAAE,CAAA;IACf,KAAK,CAAC,EAAE,MAAM,EAAE,CAAA;IAChB,YAAY,CAAC,EAAE,YAAY,CAAC,kBAAkB,CAAA;CACjD;AAED,UAAU,WAAY,SAAQ,IAAI,CAAC,OAAO,CAAC,+BAA+B,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAC7F,KAAK,CAAC,EAAE,IAAI,EAAE,CAAA;IACd,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;CACrB;AAED,MAAM,CAAC,OAAO,OAAO,YAAY;IAKzB,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,qBAAqB;IALjC,OAAO,CAAC,OAAO,CAAqD;IACpE,OAAO,CAAC,aAAa,CAAsC;gBAG/C,YAAY,GAAE,WAAyC,EACvD,qBAAqB,GAAE,oBAA2C;IAI9E,WAAW;IASX;;;OAGG;IACH,aAAa,CAAC,QAAQ,EAAE,MAAM;IA+C9B;;;OAGG;IACH,KAAK,CAAC,MAAM,GAAE,WAAgB;IAwC9B;;;OAGG;IACH,UAAU,CAAC,OAAO,EAAE,QAAQ,CAAC,KAAK;IAkClC;;;OAGG;IACH,QAAQ,CAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,EAAE,UAAU,CAAC,EAAE,IAAI,EAAE;IA8C/C;;;;;;;;OAQG;IACH,0BAA0B,CAAC,cAAc,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE;IAqCnE;;OAEG;IACH,SAAS;IAIT;;OAEG;IACH,eAAe,CAAC,CAAC,CAAC,EAAE,MAAM;IAQ1B;;;;;;;;OAQG;IACH,MAAM,CAAC,YAAY,CAAC,QAAQ,EAAE,IAAI,EAAE,EAAE,YAAY,CAAC,EAAE,OAAO,EAAE,WAAW,GAAE,WAAyC,EAAE,cAAc,CAAC,EAAE,MAAM;IA+C7I;;;;;;OAMG;IACH,WAAW,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE;CAU/C"}

package/build/lib/ConfigParser.js

@@ -149,17 +149,26 @@ class ConfigParser {
         }
     }
     /**
-     * get excluded files from config pattern
+     * determine what specs to run based on the spec(s), suite(s), exclude
+     * attributes from CLI, config and capabilities
      */
     getSpecs(capSpecs, capExclude) {
         var _a;
+        const isSpecParamPassed = Array.isArray(this._config.spec);
+        // when CLI --spec is explicitly specified, this._config.specs contains the filtered
+        // specs matching the passed pattern else the specs defined inside the config are returned
         let specs = ConfigParser.getFilePaths(this._config.specs, undefined, this._pathService);
-        let spec = Array.isArray(this._config.spec) ? this._config.spec : [];
         let exclude = ConfigParser.getFilePaths(this._config.exclude, undefined, this._pathService);
         let suites = Array.isArray(this._config.suite) ? this._config.suite : [];
-        /**
-         * check if user has specified a specific suites to run
-         */
+        // only use capability excludes if (CLI) --exclude or config exclude are not defined
+        if (Array.isArray(capExclude) && exclude.length === 0) {
+            exclude = ConfigParser.getFilePaths(capExclude, undefined, this._pathService);
+        }
+        // only use capability specs if (CLI) --spec is not defined
+        if (!isSpecParamPassed && Array.isArray(capSpecs)) {
+            specs = ConfigParser.getFilePaths(capSpecs, undefined, this._pathService);
+        }
+        // handle case where user passes --suite via CLI
         if (suites.length > 0) {
             let suiteSpecs = [];
             for (let suiteName of suites) {
@@ -176,29 +185,10 @@ class ConfigParser {
                     'in your config file or doesn\'t contain any files!');
             }
             // Allow --suite and --spec to both be defined on the command line
-            // Removing any duplicate tests that could be included
-            let tmpSpecs = spec.length > 0 ? [...specs, ...suiteSpecs] : suiteSpecs;
-            //Only merge capability specs if --spec is not defined
-            if (spec.length === 0) {
-                if (Array.isArray(capSpecs)) {
-                    tmpSpecs = ConfigParser.getFilePaths(capSpecs, undefined, this._pathService);
-                }
-                if (Array.isArray(capExclude)) {
-                    exclude = ConfigParser.getFilePaths(capExclude, undefined, this._pathService);
-                }
-            }
-            specs = [...new Set(tmpSpecs)];
-            return this.filterSpecs(specs, exclude);
-        }
-        //Only merge capability specs if --spec is not defined
-        if (spec.length === 0) {
-            if (Array.isArray(capSpecs)) {
-                specs = ConfigParser.getFilePaths(capSpecs, undefined, this._pathService);
-            }
-            if (Array.isArray(capExclude)) {
-                exclude = ConfigParser.getFilePaths(capExclude, undefined, this._pathService);
-            }
+            specs = isSpecParamPassed ? [...specs, ...suiteSpecs] : suiteSpecs;
         }
+        // Remove any duplicate tests from the final specs array
+        specs = [...new Set(specs)];
         return this.filterSpecs(specs, exclude);
     }
     /**
@@ -216,7 +206,7 @@ class ConfigParser {
         cliArgFileList.forEach(filteredFile => {
             filteredFile = (0, utils_1.removeLineNumbers)(filteredFile);
             // Send single file/file glob to getFilePaths - not supporting hierarchy in spec/exclude
-            // Return value will alwyas be string[]
+            // Return value will always be string[]
             let globMatchedFiles = ConfigParser.getFilePaths(this._pathService.glob(filteredFile), undefined, this._pathService);
             if (this._pathService.isFile(filteredFile)) {
                 filesToFilter.add(this._pathService.ensureAbsolutePath(filteredFile));
@@ -268,10 +258,10 @@ class ConfigParser {
     /**
      * returns a flattened list of globbed files
      *
-     * @param  {String[] | String[][]} filenames list of files to glob
-     * @param  {Boolean} flag to indicate omission of warnings
-     * @param  {FileSystemPathService} file system path service for expanding globbed file names
-     * @param  {number} hierarchy depth to prevent recursive calling beyond a depth of 1
+     * @param  {String[] | String[][]} patterns list of files to glob
+     * @param  {Boolean} omitWarnings to indicate omission of warnings
+     * @param  {FileSystemPathService} findAndGlob system path service for expanding globbed file names
+     * @param  {number} hierarchyDepth depth to prevent recursive calling beyond a depth of 1
      * @return {String[] | String[][]} list of files
      */
     static getFilePaths(patterns, omitWarnings, findAndGlob = new FileSystemPathService_1.default(), hierarchyDepth) {
@@ -281,7 +271,6 @@ class ConfigParser {
             patterns = [patterns];
         }
         // patterns must be an array of strings and/or string arrays
-        // check and throw and error if not
         if (!Array.isArray(patterns)) {
             throw new Error('specs or exclude property should be an array of strings, specs may also be an array of string arrays');
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wdio/config",
-  "version": "7.25.4",
+  "version": "7.26.0",
   "description": "A helper utility to parse and validate WebdriverIO options",
   "author": "Christian Bromann <mail@bromann.dev>",
   "homepage": "https://github.com/webdriverio/webdriverio/tree/main/packages/wdio-config",
@@ -23,9 +23,9 @@
   },
   "types": "./build/index.d.ts",
   "dependencies": {
-    "@wdio/logger": "7.19.0",
-    "@wdio/types": "7.25.4",
-    "@wdio/utils": "7.25.4",
+    "@wdio/logger": "7.26.0",
+    "@wdio/types": "7.26.0",
+    "@wdio/utils": "7.26.0",
     "deepmerge": "^4.0.0",
     "glob": "^8.0.3"
   },
@@ -36,5 +36,5 @@
     "minimatch": "^5.0.0",
     "tsconfig-paths": "^4.0.0"
   },
-  "gitHead": "7e41cd86779937722b6f824d10375b039aee620f"
+  "gitHead": "573927a79dc0a2b9d9a9e19e7d1b8c1ff9fac308"
 }