@wdio/utils 5.16.10 → 5.16.15

package/build/shim.js

@@ -10,6 +10,11 @@ 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;
+exports.runSync = runSync;
 
 let executeHooksWithArgs = async function executeHooksWithArgsShim(hooks, args) {
   if (!Array.isArray(hooks)) {
@@ -52,34 +57,91 @@ let runFnInFiberContext = function (fn) {
 
 exports.runFnInFiberContext = runFnInFiberContext;
 
-let wrapCommand = (_, origFn) => origFn;
+let wrapCommand = function wrapCommand(commandName, fn) {
+  return async function wrapCommandFn(...args) {
+    const beforeHookArgs = [commandName, args];
+
+    if (!inCommandHook && this.options.beforeCommand) {
+      inCommandHook = true;
+      await executeHooksWithArgs.call(this, this.options.beforeCommand, beforeHookArgs);
+      inCommandHook = false;
+    }
+
+    let commandResult;
+    let commandError;
+
+    try {
+      commandResult = await fn.apply(this, args);
+    } catch (err) {
+      commandError = err;
+    }
+
+    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 hasWdioSyncSupport = false;
-exports.hasWdioSyncSupport = hasWdioSyncSupport;
 
-let executeSync = function (fn, _, args = []) {
-  return fn.apply(this, args);
+let executeSync = async function (fn, retries, args = []) {
+  this.wdioRetries = retries.attempts;
+
+  try {
+    let res = fn.apply(this, args);
+
+    if (res instanceof Promise) {
+      return await res;
+    }
+
+    return res;
+  } catch (e) {
+    if (retries.limit > retries.attempts) {
+      retries.attempts++;
+      return await executeSync.call(this, fn, retries, args);
+    }
+
+    return Promise.reject(e);
+  }
 };
 
 exports.executeSync = executeSync;
 
-let executeAsync = function (fn, _, args = []) {
-  return fn.apply(this, args);
+const executeAsync = async function (fn, retries, args = []) {
+  this.wdioRetries = retries.attempts;
+
+  try {
+    return await fn.apply(this, args);
+  } catch (e) {
+    if (retries.limit > retries.attempts) {
+      retries.attempts++;
+      return await executeAsync.call(this, fn, retries, args);
+    }
+
+    throw e;
+  }
 };
 
 exports.executeAsync = executeAsync;
-let runSync = null;
-exports.runSync = runSync;
 
 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.executeAsync = executeAsync = wdioSync.executeAsync;
-  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; }
 
@@ -67,6 +67,11 @@ const testFrameworkFnWrapper = async function ({
 
   const duration = Date.now() - testStart;
   let afterArgs = afterFnArgs(this);
+
+  if (!error && afterArgs[0] && afterArgs[0].failedExpectations && afterArgs[0].failedExpectations.length) {
+    error = afterArgs[0].failedExpectations[0];
+  }
+
   afterArgs.push({
     retries,
     error,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wdio/utils",
-  "version": "5.16.10",
+  "version": "5.16.15",
   "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": "e4745ca3e9f615d4e0df7ec4e2b38114ddd51e9d"
+  "gitHead": "3f388c0f8b5b3ff56db62c6183dd92cdf39df0f3"
 }