@applitools/eyes-cypress 3.25.5 → 3.25.6

package/CHANGELOG.md

@@ -5,6 +5,15 @@
 
 
 
+
+
+## 3.25.6 - 2022/4/25
+
+### Features
+### Bug fixes
+- 'batch.properties' and 'batch.notifyOnCompletion' not propagated correctly
+- 'batch.name' was overridden in case 'batch.id' was not defined
+
 ## 3.25.5 - 2022/4/19
 
 ### Features

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applitools/eyes-cypress",
-  "version": "3.25.5",
+  "version": "3.25.6",
   "main": "index.js",
   "license": "SEE LICENSE IN LICENSE",
   "bin": {
@@ -47,10 +47,10 @@
   "dependencies": {
     "@applitools/dom-snapshot": "4.5.12",
     "@applitools/eyes-api": "1.3.0",
-    "@applitools/eyes-universal": "2.2.1",
+    "@applitools/eyes-universal": "2.2.5",
     "@applitools/functional-commons": "1.6.0",
     "@applitools/logger": "1.0.12",
-    "@applitools/visual-grid-client": "15.12.2",
+    "@applitools/visual-grid-client": "15.12.4",
     "body-parser": "1.19.0",
     "chalk": "3.0.0",
     "cors": "2.8.5",

package/src/browser/eyesOpenMapping.js

@@ -1,29 +1,35 @@
+const batchPropertiesRetriever = (args, appliConfFile) => {
+  return function(prop, nestedProp) {
+    nestedProp = nestedProp || prop;
+    if (args.hasOwnProperty(prop)) {
+      return args[prop];
+    } else if (args.batch && args.batch.hasOwnProperty(nestedProp)) {
+      return args.batch[nestedProp];
+    } else if (appliConfFile.hasOwnProperty(prop)) {
+      return appliConfFile[prop];
+    } else if (appliConfFile.batch && appliConfFile.batch.hasOwnProperty(nestedProp)) {
+      return appliConfFile.batch[nestedProp];
+    }
+    return undefined;
+  };
+};
 function eyesOpenMapValues({args, appliConfFile, testName, shouldUseBrowserHooks}) {
   let browsersInfo = args.browser || appliConfFile.browser;
   let accessibilitySettings = args.accessibilityValidation || appliConfFile.accessibilityValidation;
+  const batchProperties = batchPropertiesRetriever(args, appliConfFile);
   const batch = {
-    id:
-      args.batchId ||
-      (args.batch ? args.batch.id : undefined) ||
-      appliConfFile.batchId ||
-      (appliConfFile.batch ? appliConfFile.batch.id : undefined),
-    name:
-      args.batchName ||
-      (args.batch ? args.batch.name : undefined) ||
-      appliConfFile.batchName ||
-      (appliConfFile.batch ? appliConfFile.batch.name : undefined),
-    sequenceName:
-      args.batchSequenceName ||
-      (args.batch ? args.batch.sequenceName : undefined) ||
-      appliConfFile.batchSequenceName ||
-      (appliConfFile.batch ? appliConfFile.batch.sequenceName : undefined),
+    id: batchProperties('batchId', 'id'),
+    name: batchProperties('batchName', 'name'),
+    sequenceName: batchProperties('batchSequenceName', 'sequenceName'),
+    notifyOnCompletion: batchProperties('notifyOnCompletion'),
+    properties:
+      (args.batch ? args.batch.properties : undefined) ||
+      (appliConfFile.batch ? appliConfFile.batch.properties : undefined),
   };
-
-  if (!batch.name) {
-    delete batch['name'];
-  }
-  if (!batch.sequenceName) {
-    delete batch['sequenceName'];
+  for (let prop in batch) {
+    if (typeof batch[prop] === 'undefined') {
+      delete batch[prop];
+    }
   }
 
   const mappedValues = [

package/src/plugin/config.js

@@ -16,9 +16,7 @@ function makeConfig() {
   });
 
   if ((!config.batch || !config.batch.id) && !config.batchId) {
-    config.batch = {
-      id: uuid.v4(),
-    };
+    config.batch = {id: uuid.v4(), ...config.batch};
   }
 
   if (config.failCypressOnDiff === '0') {