@wdio/utils 5.16.12 → 5.23.0

package/build/envDetector.js

@@ -79,7 +79,7 @@ function sessionEnvironmentDetector({
     isMobile: isMobile(capabilities),
     isIOS: isIOS(capabilities),
     isAndroid: isAndroid(capabilities),
-    isSauce: isSauce(requestedCapabilities.w3cCaps.alwaysMatch),
+    isSauce: isSauce(requestedCapabilities),
     isSeleniumStandalone: isSeleniumStandalone(capabilities)
   };
 }

package/build/initialisePlugin.js

@@ -5,10 +5,14 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = initialisePlugin;
 
+var _path = _interopRequireDefault(require("path"));
+
 var _utils = require("./utils");
 
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
 function initialisePlugin(name, type, target = 'default') {
-  if (name[0] === '@') {
+  if (name[0] === '@' || _path.default.isAbsolute(name)) {
     const service = (0, _utils.safeRequire)(name);
     return service[target];
   }

package/build/monad.js

@@ -33,6 +33,9 @@ function WebDriver(options, modifier, propertiesObject = {}) {
     propertiesObject.options = {
       value: options
     };
+    propertiesObject.requestedCapabilities = {
+      value: options.requestedCapabilities
+    };
 
     if (typeof commandWrapper === 'function') {
       for (const [commandName, {

package/build/shim.js

@@ -10,6 +10,7 @@ var _logger = _interopRequireDefault(require("@wdio/logger"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const log = (0, _logger.default)('@wdio/utils:shim');
+let inCommandHook = false;
 let hasWdioSyncSupport = false;
 exports.hasWdioSyncSupport = hasWdioSyncSupport;
 let runSync = null;
@@ -56,30 +57,44 @@ let runFnInFiberContext = function (fn) {
 
 exports.runFnInFiberContext = runFnInFiberContext;
 
-let wrapCommand = async function (commandName, fn, ...args) {
-  await executeHooksWithArgs.call(this, this.options.beforeCommand, [commandName, args]);
-  let commandResult;
-  let commandError;
+let wrapCommand = function wrapCommand(commandName, fn) {
+  return async function wrapCommandFn(...args) {
+    const beforeHookArgs = [commandName, args];
 
-  try {
-    commandResult = await fn.apply(this, args);
-  } catch (err) {
-    commandError = err;
-  }
+    if (!inCommandHook && this.options.beforeCommand) {
+      inCommandHook = true;
+      await executeHooksWithArgs.call(this, this.options.beforeCommand, beforeHookArgs);
+      inCommandHook = false;
+    }
 
-  await executeHooksWithArgs.call(this, this.options.afterCommand, [commandName, args, commandResult, commandError]);
+    let commandResult;
+    let commandError;
 
-  if (commandError) {
-    throw commandError;
-  }
+    try {
+      commandResult = await fn.apply(this, args);
+    } catch (err) {
+      commandError = err;
+    }
 
-  return commandResult;
+    if (!inCommandHook && this.options.afterCommand) {
+      inCommandHook = true;
+      const afterHookArgs = [...beforeHookArgs, commandResult, commandError];
+      await executeHooksWithArgs.call(this, this.options.afterCommand, afterHookArgs);
+      inCommandHook = false;
+    }
+
+    if (commandError) {
+      throw commandError;
+    }
+
+    return commandResult;
+  };
 };
 
 exports.wrapCommand = wrapCommand;
 
 let executeSync = async function (fn, retries, args = []) {
-  this.retries = retries.attempts;
+  this.wdioRetries = retries.attempts;
 
   try {
     let res = fn.apply(this, args);
@@ -102,7 +117,7 @@ let executeSync = async function (fn, retries, args = []) {
 exports.executeSync = executeSync;
 
 const executeAsync = async function (fn, retries, args = []) {
-  this.retries = retries.attempts;
+  this.wdioRetries = retries.attempts;
 
   try {
     return await fn.apply(this, args);
@@ -119,12 +134,14 @@ const executeAsync = async function (fn, retries, args = []) {
 exports.executeAsync = executeAsync;
 
 try {
-  const wdioSync = require('@wdio/sync');
-
-  exports.hasWdioSyncSupport = hasWdioSyncSupport = true;
-  exports.runFnInFiberContext = runFnInFiberContext = wdioSync.runFnInFiberContext;
-  exports.wrapCommand = wrapCommand = wdioSync.wrapCommand;
-  exports.executeHooksWithArgs = executeHooksWithArgs = wdioSync.executeHooksWithArgs;
-  exports.executeSync = executeSync = wdioSync.executeSync;
-  exports.runSync = runSync = wdioSync.runSync;
+  if (!process.env.WDIO_NO_SYNC_SUPPORT) {
+    const wdioSync = require('@wdio/sync');
+
+    exports.hasWdioSyncSupport = hasWdioSyncSupport = true;
+    exports.runFnInFiberContext = runFnInFiberContext = wdioSync.runFnInFiberContext;
+    exports.wrapCommand = wrapCommand = wdioSync.wrapCommand;
+    exports.executeHooksWithArgs = executeHooksWithArgs = wdioSync.executeHooksWithArgs;
+    exports.executeSync = executeSync = wdioSync.executeSync;
+    exports.runSync = runSync = wdioSync.runSync;
+  }
 } catch (_unused) {}

package/build/test-framework/testFnWrapper.js

@@ -13,7 +13,7 @@ var _shim = require("../shim");
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(source, true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(source).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
@@ -46,7 +46,7 @@ const testFrameworkFnWrapper = async function ({
     limit: repeatTest
   };
   const beforeArgs = mochaJasmineCompatibility(beforeFnArgs(this), this);
-  await (0, _errorHandler.logHookError)(`Before${type}`, (await executeHooksWithArgs(beforeFn, beforeArgs)), cid);
+  await (0, _errorHandler.logHookError)(`Before${type}`, await executeHooksWithArgs(beforeFn, beforeArgs), cid);
   let promise;
   let result;
   let error;
@@ -82,7 +82,7 @@ const testFrameworkFnWrapper = async function ({
   afterArgs = mochaJasmineCompatibility(afterArgs, this);
   afterArgs = mochaJasmineResultCompatibility(afterArgs, error, duration);
   afterArgs = cucumberCompatibility(afterArgs);
-  await (0, _errorHandler.logHookError)(`After${type}`, (await executeHooksWithArgs(afterFn, [...afterArgs])), cid);
+  await (0, _errorHandler.logHookError)(`After${type}`, await executeHooksWithArgs(afterFn, [...afterArgs]), cid);
 
   if (error) {
     throw error;
@@ -113,7 +113,7 @@ const mochaJasmineResultCompatibility = (afterArgs, error, duration) => {
   let args = afterArgs;
 
   if (afterArgs.length === 3 && afterArgs[0] && typeof afterArgs[0] === 'object') {
-    args = [_objectSpread({}, afterArgs[0], {
+    args = [_objectSpread(_objectSpread({}, afterArgs[0]), {}, {
       error,
       duration,
       passed: !error

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wdio/utils",
-  "version": "5.16.12",
+  "version": "5.23.0",
   "description": "A WDIO helper utility to provide several utility functions used across the project.",
   "author": "Christian Bromann <christian@saucelabs.com>",
   "homepage": "https://github.com/webdriverio/webdriverio/tree/master/packages/wdio-utils",
@@ -37,5 +37,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "6bb593e8170fd9f7032fd0d1767147ce167d4c89"
+  "gitHead": "a9b8098ad18074e05a72c0458a7845a41a40aa93"
 }