@wdio/config 7.20.3 → 7.20.8

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;IAG9E,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;IAoDnD;;;;;;;;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;;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"}

package/build/lib/ConfigParser.js

@@ -178,20 +178,26 @@ class ConfigParser {
             // 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)) {
-                tmpSpecs = ConfigParser.getFilePaths(capSpecs, undefined, this._pathService);
+                specs = 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);
-        }
-        if (Array.isArray(capSpecs)) {
-            specs = ConfigParser.getFilePaths(capSpecs, undefined, this._pathService);
-        }
-        if (Array.isArray(capExclude)) {
-            exclude = ConfigParser.getFilePaths(capExclude, undefined, this._pathService);
         }
         return this.filterSpecs(specs, exclude);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wdio/config",
-  "version": "7.20.3",
+  "version": "7.20.8",
   "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",
@@ -24,8 +24,8 @@
   "types": "./build/index.d.ts",
   "dependencies": {
     "@wdio/logger": "7.19.0",
-    "@wdio/types": "7.20.3",
-    "@wdio/utils": "7.20.3",
+    "@wdio/types": "7.20.7",
+    "@wdio/utils": "7.20.7",
     "deepmerge": "^4.0.0",
     "glob": "^8.0.3"
   },
@@ -34,7 +34,7 @@
   },
   "devDependencies": {
     "minimatch": "^5.0.0",
-    "tsconfig-paths": "^3.9.0"
+    "tsconfig-paths": "^4.0.0"
   },
-  "gitHead": "df5cbf4f557ddc04f49ebc25b9a74231fdd44f2b"
+  "gitHead": "8ea0ee903b02157b9ee511c8750be2282b4f4519"
 }