@wdio/utils 6.0.11 → 6.1.0

package/build/index.js

@@ -57,6 +57,12 @@ Object.defineProperty(exports, "isFunctionAsync", {
     return _utils.isFunctionAsync;
   }
 });
+Object.defineProperty(exports, "transformCommandLogResult", {
+  enumerable: true,
+  get: function () {
+    return _utils.transformCommandLogResult;
+  }
+});
 Object.defineProperty(exports, "wrapCommand", {
   enumerable: true,
   get: function () {

package/build/initialiseServices.js

@@ -17,7 +17,7 @@ const log = (0, _logger.default)('@wdio/utils:initialiseServices');
 function initialiseServices(services) {
   const initialisedServices = [];
 
-  for (let [serviceName, serviceConfig] of services) {
+  for (let [serviceName, serviceConfig = {}] of services) {
     if (typeof serviceName === 'object') {
       log.debug('initialise custom initiated service');
       initialisedServices.push([serviceName, {}]);

package/build/utils.js

@@ -5,11 +5,14 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.overwriteElementCommands = overwriteElementCommands;
 exports.commandCallStructure = commandCallStructure;
+exports.transformCommandLogResult = transformCommandLogResult;
 exports.isValidParameter = isValidParameter;
 exports.getArgumentType = getArgumentType;
 exports.safeRequire = safeRequire;
 exports.isFunctionAsync = isFunctionAsync;
 exports.filterSpecArgs = filterSpecArgs;
+exports.isBase64 = isBase64;
+const SCREENSHOT_REPLACEMENT = '"<Screenshot[base64]>"';
 
 function overwriteElementCommands(propertiesObject) {
   const elementOverrides = propertiesObject['__elementOverrides__'] ? propertiesObject['__elementOverrides__'].value : {};
@@ -54,6 +57,8 @@ function commandCallStructure(commandName, args) {
   const callArgs = args.map(arg => {
     if (typeof arg === 'string' && (arg.startsWith('!function(') || arg.startsWith('return (function'))) {
       arg = '<fn>';
+    } else if (typeof arg === 'string' && isBase64(arg)) {
+      arg = SCREENSHOT_REPLACEMENT;
     } else if (typeof arg === 'string') {
       arg = `"${arg}"`;
     } else if (typeof arg === 'function') {
@@ -71,6 +76,14 @@ function commandCallStructure(commandName, args) {
   return `${commandName}(${callArgs})`;
 }
 
+function transformCommandLogResult(result) {
+  if (typeof result.file === 'string' && isBase64(result.file)) {
+    return SCREENSHOT_REPLACEMENT;
+  }
+
+  return result;
+}
+
 function isValidParameter(arg, expectedType) {
   let shouldBeArray = false;
 
@@ -135,4 +148,22 @@ function isFunctionAsync(fn) {
 
 function filterSpecArgs(args) {
   return args.filter(arg => typeof arg !== 'function');
+}
+
+function isBase64(str) {
+  var notBase64 = new RegExp('[^A-Z0-9+\\/=]', 'i');
+  const isString = typeof str === 'string' || str instanceof String;
+
+  if (!isString) {
+    throw new Error('Expected string but received invalid type.');
+  }
+
+  const len = str.length;
+
+  if (!len || len % 4 !== 0 || notBase64.test(str)) {
+    return false;
+  }
+
+  const firstPaddingChar = str.indexOf('=');
+  return firstPaddingChar === -1 || firstPaddingChar === len - 1 || firstPaddingChar === len - 2 && str[len - 1] === '=';
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wdio/utils",
-  "version": "6.0.11",
+  "version": "6.1.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",
@@ -31,10 +31,10 @@
     "url": "https://github.com/webdriverio/webdriverio/issues"
   },
   "dependencies": {
-    "@wdio/logger": "6.0.11"
+    "@wdio/logger": "6.0.16"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "f90dbdfc2c165f4b28e32f55f1d422ac0a521155"
+  "gitHead": "15034d0acef9a6de046df31f60850023cb52bce9"
 }