@wdio/config 5.7.13 → 5.9.1

package/build/lib/ConfigParser.js

@@ -195,8 +195,18 @@ class ConfigParser {
       // Removing any duplicate tests that could be included
 
 
-      const tmpSpecs = spec.length > 0 ? [...specs, ...suiteSpecs] : suiteSpecs;
-      return [...new Set(tmpSpecs)];
+      let tmpSpecs = spec.length > 0 ? [...specs, ...suiteSpecs] : suiteSpecs;
+
+      if (Array.isArray(capSpecs)) {
+        tmpSpecs = tmpSpecs.concat(ConfigParser.getFilePaths(capSpecs));
+      }
+
+      if (Array.isArray(capExclude)) {
+        exclude = exclude.concat(ConfigParser.getFilePaths(capExclude));
+      }
+
+      specs = [...new Set(tmpSpecs)];
+      return specs.filter(spec => !exclude.includes(spec));
     }
 
     if (Array.isArray(capSpecs)) {
@@ -207,7 +217,7 @@ class ConfigParser {
       exclude = exclude.concat(ConfigParser.getFilePaths(capExclude));
     }
 
-    return specs.filter(spec => exclude.indexOf(spec) < 0);
+    return specs.filter(spec => !exclude.includes(spec));
   }
   /**
    * sets config attribute with file paths from filtering

package/build/utils.js

@@ -14,18 +14,17 @@ const REGION_MAPPING = {
   // default endpoint
   'eu': 'eu-central-1.',
   'eu-central-1': 'eu-central-1.',
-  'us-east-1': 'us-east1.'
+  'us-east-1': 'us-east-1.'
 };
 
-function getSauceEndpoint(region, isRDC, isHeadless) {
+function getSauceEndpoint(region, isRDC) {
   const shortRegion = REGION_MAPPING[region] ? region : 'us';
-  const product = isHeadless ? 'headless.' : '';
 
   if (isRDC) {
     return `${shortRegion}1.appium.testobject.com`;
   }
 
-  return `ondemand.${REGION_MAPPING[shortRegion]}${product}saucelabs.com`;
+  return `ondemand.${REGION_MAPPING[shortRegion]}saucelabs.com`;
 }
 /**
  * helper to detect the Selenium backend according to given capabilities
@@ -77,19 +76,9 @@ function detectBackend(options = {}, isRDC = false) {
   isRDC) {
     // Sauce headless is currently only in us-east-1
     const sauceRegion = headless ? 'us-east-1' : region;
-    /**
-     * headless runs not over SSL which might change soon
-     * see https://wiki.saucelabs.com/display/DOCS/Sauce+Headless+Beta
-     */
-
-    if (headless) {
-      protocol = 'http';
-      port = 4444;
-    }
-
     return {
       protocol: protocol || 'https',
-      hostname: hostname || getSauceEndpoint(sauceRegion, isRDC, headless),
+      hostname: hostname || getSauceEndpoint(sauceRegion, isRDC),
       port: port || 443
     };
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wdio/config",
-  "version": "5.7.13",
+  "version": "5.9.1",
   "description": "A helper utility to parse and validate WebdriverIO options",
   "author": "Christian Bromann <christian@saucelabs.com>",
   "homepage": "https://github.com/webdriverio/webdriverio/tree/master/packages/wdio-config",
@@ -30,12 +30,12 @@
     "url": "https://github.com/webdriverio/webdriverio/issues"
   },
   "dependencies": {
-    "@wdio/logger": "^5.7.8",
+    "@wdio/logger": "^5.9.0",
     "deepmerge": "^2.0.1",
     "glob": "^7.1.2"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "06d4bc3faa3c69b35f600c1b45b7a5d3fb537130"
+  "gitHead": "575883b611fde854fae80830e91417d88838aa50"
 }