@applitools/eyes-cypress 3.28.0 → 3.28.1

package/CHANGELOG.md

@@ -12,6 +12,12 @@
 
 
 
+## 3.28.1 - 2023/1/5
+
+### Features
+### Bug fixes
+- Wrong url when running `cypress run`
+
 ## 3.28.0 - 2022/12/28
 
 ### Features

package/bin/eyes-setup.js

@@ -1,31 +1,31 @@
 #!/usr/bin/env node
-'use strict';
+'use strict'
 
-const chalk = require('chalk');
-const handlePlugin = require('../src/setup/handlePlugin');
-const handleCommands = require('../src/setup/handleCommands');
-const {handleTypeScript} = require('../src/setup/handleTypeScript');
-const getCypressVersion = require('../src/setup/getCypressVersion');
-const getCypressPaths = require('../src/setup/getCypressPaths');
+const chalk = require('chalk')
+const handlePlugin = require('../src/setup/handlePlugin')
+const handleCommands = require('../src/setup/handleCommands')
+const {handleTypeScript} = require('../src/setup/handleTypeScript')
+const getCypressVersion = require('../src/setup/getCypressVersion')
+const getCypressPaths = require('../src/setup/getCypressPaths')
 
-const cwd = process.cwd();
-const semver = require('semver');
-const {version} = require('../package');
+const cwd = process.cwd()
+const semver = require('semver')
+const {version} = require('../package')
 
-console.log(chalk.cyan('Setup Eyes-Cypress', version));
+console.log(chalk.cyan('Setup Eyes-Cypress', version))
 
-const cypressVersion = getCypressVersion();
-console.log(chalk.cyan(`Cypress version: ${cypressVersion}`));
+const cypressVersion = getCypressVersion()
+console.log(chalk.cyan(`Cypress version: ${cypressVersion}`))
 
-const isCypress10 = semver.satisfies(cypressVersion, '>=10.0.0');
+const isCypress10 = semver.satisfies(cypressVersion, '>=10.0.0')
 try {
-  const {plugin, support, typescript} = getCypressPaths({cwd, isCypress10});
-  handlePlugin(plugin);
-  handleCommands(support);
-  handleTypeScript(typescript);
+  const {plugin, support, typescript} = getCypressPaths({cwd, isCypress10})
+  handlePlugin(plugin)
+  handleCommands(support)
+  handleTypeScript(typescript)
 } catch (err) {
-  console.log(chalk.red(`Setup error:\n${err.message}`));
-  process.exit(1);
+  console.log(chalk.red(`Setup error:\n${err.message}`))
+  process.exit(1)
 }
 
-console.log(chalk.cyan('Setup done!'));
+console.log(chalk.cyan('Setup done!'))

package/index.js

@@ -1,2 +1,2 @@
-'use strict';
-module.exports = require('./src/plugin/startPlugin');
+'use strict'
+module.exports = require('./src/plugin/startPlugin')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applitools/eyes-cypress",
-  "version": "3.28.0",
+  "version": "3.28.1",
   "repository": {
     "type": "git",
     "url": "git://github.com/applitools/eyes.sdk.javascript1.git",
@@ -56,8 +56,8 @@
     }
   },
   "dependencies": {
-    "@applitools/core": "1.3.6",
-    "@applitools/eyes-api": "1.11.5",
+    "@applitools/core": "1.3.7",
+    "@applitools/eyes-api": "1.11.6",
     "@applitools/eyes-universal": "2.18.0",
     "@applitools/functional-commons": "1.6.0",
     "@applitools/logger": "1.1.36",
@@ -73,7 +73,7 @@
     "@applitools/sdk-coverage-tests": "^2.7.10",
     "@applitools/snaptdout": "1.0.1",
     "@applitools/test-server": "1.1.16",
-    "@applitools/test-utils": "1.5.5",
+    "@applitools/test-utils": "1.5.6",
     "@applitools/utils": "1.3.22",
     "@types/node": "12",
     "@types/which": "^2.0.1",
@@ -85,16 +85,18 @@
     "cookie-parser": "1.4.4",
     "cypress": "9.7.0",
     "eslint": "8.10.0",
+    "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-mocha-no-only": "1.1.0",
-    "eslint-plugin-node": "7.0.1",
-    "eslint-plugin-prettier": "2.7.0",
+    "eslint-plugin-no-only-tests": "^3.0.0",
+    "eslint-plugin-node": "^11.1.0",
+    "eslint-plugin-prettier": "^4.0.0",
     "husky": "4.3.8",
     "lodash.omit": "4.5.0",
     "mocha": "8.0.1",
     "morgan": "1.9.1",
     "ncp": "2.0.0",
     "node-fetch": "2.6.0",
-    "prettier": "1.19.1",
+    "prettier": "^2.6.2",
     "typescript": "4.8.4"
   },
   "engines": {

package/src/browser/commands.js

@@ -1,45 +1,44 @@
 /* global Cypress,cy,after */
-'use strict';
-const spec = require('../../dist/browser/spec-driver');
-const Refer = require('./refer');
-const Socket = require('./socket');
-const {socketCommands} = require('./socketCommands');
-const {eyesOpenMapValues} = require('./eyesOpenMapping');
-const {eyesCheckMapValues} = require('./eyesCheckMapping');
-const {TestResultsSummary} = require('@applitools/eyes-api');
-const refer = new Refer();
-const socket = new Socket();
-const throwErr = Cypress.config('failCypressOnDiff');
-socketCommands(socket, refer);
-let connectedToUniversal = false;
+'use strict'
+const spec = require('../../dist/browser/spec-driver')
+const Refer = require('./refer')
+const Socket = require('./socket')
+const {socketCommands} = require('./socketCommands')
+const {eyesOpenMapValues} = require('./eyesOpenMapping')
+const {eyesCheckMapValues} = require('./eyesCheckMapping')
+const {TestResultsSummary} = require('@applitools/eyes-api')
+const refer = new Refer()
+const socket = new Socket()
+const throwErr = Cypress.config('failCypressOnDiff')
+socketCommands(socket, refer)
+let connectedToUniversal = false
 
 let manager,
   eyes,
-  closePromiseArr = [];
+  closePromiseArr = []
 
 function getGlobalConfigProperty(prop) {
-  const property = Cypress.config(prop);
-  const shouldParse = ['eyesBrowser', 'eyesLayoutBreakpoints'];
-  return property ? (shouldParse.includes(prop) ? JSON.parse(property) : property) : undefined;
+  const property = Cypress.config(prop)
+  const shouldParse = ['eyesBrowser', 'eyesLayoutBreakpoints']
+  return property ? (shouldParse.includes(prop) ? JSON.parse(property) : property) : undefined
 }
 
 const shouldUseBrowserHooks =
   !getGlobalConfigProperty('eyesIsDisabled') &&
-  (getGlobalConfigProperty('isInteractive') ||
-    !getGlobalConfigProperty('eyesIsGlobalHooksSupported'));
+  (getGlobalConfigProperty('isInteractive') || !getGlobalConfigProperty('eyesIsGlobalHooksSupported'))
 
 Cypress.Commands.add('eyesGetAllTestResults', () => {
-  Cypress.log({name: 'Eyes: getAllTestResults'});
+  Cypress.log({name: 'Eyes: getAllTestResults'})
   return cy.then({timeout: 86400000}, async () => {
     if (isCurrentTestDisabled) {
-      isCurrentTestDisabled = false;
-      return;
+      isCurrentTestDisabled = false
+      return
     }
-    await Promise.all(closePromiseArr);
-    const summary = await socket.request('EyesManager.closeManager', {manager, throwErr});
+    await Promise.all(closePromiseArr)
+    const summary = await socket.request('EyesManager.closeManager', {manager, throwErr})
 
     const deleteTest = ({settings: {testId, batchId, secretToken}}) => {
-      const {serverUrl, proxy, apiKey} = Cypress.config('appliConfFile');
+      const {serverUrl, proxy, apiKey} = Cypress.config('appliConfFile')
       return socket.request('Core.deleteTest', {
         settings: {
           testId,
@@ -49,22 +48,22 @@ Cypress.Commands.add('eyesGetAllTestResults', () => {
           proxy,
           apiKey,
         },
-      });
-    };
+      })
+    }
     summary.results = summary.results.map(res => {
-      return {...res, result: res.testResults, error: res.exception, renderer: res.browserInfo};
-    });
-    return new TestResultsSummary({summary, deleteTest});
-  });
-});
+      return {...res, result: res.testResults, error: res.exception, renderer: res.browserInfo}
+    })
+    return new TestResultsSummary({summary, deleteTest})
+  })
+})
 
 if (shouldUseBrowserHooks || Cypress.config('eyesFailCypressOnDiff')) {
   after(() => {
-    if (!manager) return;
+    if (!manager) return
     return cy.then({timeout: 86400000}, async () => {
       if (isCurrentTestDisabled) {
-        isCurrentTestDisabled = false;
-        return;
+        isCurrentTestDisabled = false
+        return
       }
       const resultConfig = {
         showLogs: Cypress.config('appliConfFile').showLogs,
@@ -73,63 +72,59 @@ if (shouldUseBrowserHooks || Cypress.config('eyesFailCypressOnDiff')) {
         tapDirPath: Cypress.config('appliConfFile').tapDirPath,
         tapFileName: Cypress.config('appliConfFile').tapFileName,
         shouldCreateTapFile: shouldUseBrowserHooks,
-      };
-      await Promise.all(closePromiseArr);
-      const summary = await socket.request('EyesManager.closeManager', {manager, throwErr});
-      const testResults = summary.results.map(({testResults}) => testResults);
-      const message = await socket.request('Test.printTestResults', {testResults, resultConfig});
+      }
+      await Promise.all(closePromiseArr)
+      const summary = await socket.request('EyesManager.closeManager', {manager, throwErr})
+      const testResults = summary.results.map(({testResults}) => testResults)
+      const message = await socket.request('Test.printTestResults', {testResults, resultConfig})
       if (
         !!getGlobalConfigProperty('eyesFailCypressOnDiff') &&
         message &&
         message.includes('Eyes-Cypress detected diffs or errors')
       ) {
-        throw new Error(message);
+        throw new Error(message)
       }
-    });
-  });
+    })
+  })
 }
 
-let isCurrentTestDisabled;
+let isCurrentTestDisabled
 
-Cypress.Commands.add('eyesOpen', function(args = {}) {
-  Cypress.log({name: 'Eyes: open'});
-  Cypress.config('eyesOpenArgs', args);
-  const {title: testName} = this.currentTest || this.test || Cypress.currentTest;
+Cypress.Commands.add('eyesOpen', function (args = {}) {
+  Cypress.log({name: 'Eyes: open'})
+  Cypress.config('eyesOpenArgs', args)
+  const {title: testName} = this.currentTest || this.test || Cypress.currentTest
 
   if (Cypress.config('eyesIsDisabled') && args.isDisabled === false) {
     throw new Error(
       `Eyes-Cypress is disabled by an env variable or in the applitools.config.js file, but the "${testName}" test was passed isDisabled:false. A single test cannot be enabled when Eyes.Cypress is disabled through the global configuration. Please remove "isDisabled:false" from cy.eyesOpen() for this test, or enable Eyes.Cypress in the global configuration, either by unsetting the APPLITOOLS_IS_DISABLED env var, or by deleting 'isDisabled' from the applitools.config.js file.`,
-    );
+    )
   }
-  isCurrentTestDisabled = getGlobalConfigProperty('eyesIsDisabled') || args.isDisabled;
-  if (isCurrentTestDisabled) return;
+  isCurrentTestDisabled = getGlobalConfigProperty('eyesIsDisabled') || args.isDisabled
+  if (isCurrentTestDisabled) return
 
   return cy.then({timeout: 86400000}, async () => {
-    setRootContext();
-    const driver = refer.ref(cy.state('window').document);
+    setRootContext()
+    const driver = refer.ref(cy.state('window').document)
 
     if (!connectedToUniversal) {
-      socket.connect(`wss://localhost:${Cypress.config('eyesPort')}/eyes`);
-      connectedToUniversal = true;
+      socket.connect(`wss://localhost:${Cypress.config('eyesPort')}/eyes`)
+      connectedToUniversal = true
       socket.emit('Core.makeSDK', {
         name: 'eyes.cypress',
         version: require('../../package.json').version,
         commands: Object.keys(spec).concat(['isSelector', 'isDriver', 'isElement']), // TODO fix spec.isSelector and spec.isDriver and spec.isElement in driver utils
-      });
+      })
 
       manager =
         manager ||
         (await socket.request(
           'Core.makeManager',
-          Object.assign(
-            {},
-            {concurrency: Cypress.config('eyesTestConcurrency')},
-            {legacy: false, type: 'vg'},
-          ),
-        ));
+          Object.assign({}, {concurrency: Cypress.config('eyesTestConcurrency')}, {legacy: false, type: 'vg'}),
+        ))
     }
 
-    const appliConfFile = Cypress.config('appliConfFile');
+    const appliConfFile = Cypress.config('appliConfFile')
     const config = eyesOpenMapValues({
       args,
       appliConfFile,
@@ -140,48 +135,48 @@ Cypress.Commands.add('eyesOpen', function(args = {}) {
         height: Cypress.config('viewportHeight'),
         name: 'chrome',
       },
-    });
-    eyes = await socket.request('EyesManager.openEyes', {manager, driver, config});
-  });
-});
+    })
+    eyes = await socket.request('EyesManager.openEyes', {manager, driver, config})
+  })
+})
 
 Cypress.Commands.add('eyesCheckWindow', (args = {}) =>
   cy.then({timeout: 86400000}, () => {
-    if (isCurrentTestDisabled) return;
+    if (isCurrentTestDisabled) return
 
-    setRootContext();
-    const driver = refer.ref(cy.state('window').document);
+    setRootContext()
+    const driver = refer.ref(cy.state('window').document)
 
-    Cypress.log({name: 'Eyes: check window'});
+    Cypress.log({name: 'Eyes: check window'})
 
-    const checkSettings = eyesCheckMapValues({args, refer});
+    const checkSettings = eyesCheckMapValues({args, refer})
 
     return socket.request('Eyes.check', {
       eyes,
       settings: checkSettings,
       driver,
-    });
+    })
   }),
-);
+)
 
 Cypress.Commands.add('eyesClose', () => {
   return cy.then({timeout: 86400000}, () => {
-    if (isCurrentTestDisabled) return;
+    if (isCurrentTestDisabled) return
 
-    Cypress.log({name: 'Eyes: close'});
+    Cypress.log({name: 'Eyes: close'})
     if (isCurrentTestDisabled) {
-      isCurrentTestDisabled = false;
-      return;
+      isCurrentTestDisabled = false
+      return
     }
 
     // intentionally not returning the result in order to not wait on the close promise
     const p = socket.request('Eyes.close', {eyes, throwErr: false}).catch(err => {
-      console.log('Error in cy.eyesClose', err);
-    });
-    closePromiseArr.push(p);
-  });
-});
+      console.log('Error in cy.eyesClose', err)
+    })
+    closePromiseArr.push(p)
+  })
+})
 
 function setRootContext() {
-  cy.state('window').document['applitools-marker'] = 'root-context';
+  cy.state('window').document['applitools-marker'] = 'root-context'
 }

package/src/browser/eyesCheckMapping.js

@@ -1,9 +1,9 @@
 /* global Node */
 function eyesCheckMapValues({args, refer}) {
   if (typeof args === `string`) {
-    args = {tag: args};
+    args = {tag: args}
   }
-  const config = args; // just did it for having less git changes at this moment
+  const config = args // just did it for having less git changes at this moment
   const mappedValues = [
     'tag',
     'scriptHooks',
@@ -16,10 +16,10 @@ function eyesCheckMapValues({args, refer}) {
     'region',
     'selector',
     'element',
-  ];
+  ]
 
-  let regionSettings = {};
-  let shadowDomSettings = {};
+  let regionSettings = {}
+  let shadowDomSettings = {}
   const checkSettings = {
     name: config.tag,
     hooks: config.scriptHooks,
@@ -29,7 +29,7 @@ function eyesCheckMapValues({args, refer}) {
     layoutRegions: convertPaddedRegion(config.layout),
     contentRegions: convertPaddedRegion(config.content),
     accessibilityRegions: convertAccessabilityRegions(config.accessibility),
-  };
+  }
 
   if (config.target === 'region') {
     if (!Array.isArray(config.selector)) {
@@ -37,12 +37,12 @@ function eyesCheckMapValues({args, refer}) {
         if (isHTMLElement(config.element)) {
           regionSettings = {
             region: Object.assign(refer.ref(config.element), {type: 'element'}),
-          };
+          }
         } else {
           // JQuery element
           regionSettings = {
             region: Object.assign(refer.ref(config.element[0]), {type: 'element'}),
-          };
+          }
         }
       } else if (
         config.region &&
@@ -58,114 +58,114 @@ function eyesCheckMapValues({args, refer}) {
             width: config.region.width,
             height: config.region.height,
           },
-        };
+        }
       } else if (!config.hasOwnProperty('selector')) {
         regionSettings = {
           region: config.region,
-        };
+        }
       } else {
         regionSettings = {
           region: config.selector,
-        };
+        }
       }
     } else {
-      const selectors = config.selector;
+      const selectors = config.selector
       for (let i = selectors.length - 1; i > -1; i--) {
         if (i === selectors.length - 1) {
-          shadowDomSettings['shadow'] = selectors[i].selector;
+          shadowDomSettings['shadow'] = selectors[i].selector
         } else {
-          const prevSettings = Object.assign({}, shadowDomSettings);
-          shadowDomSettings['selector'] = selectors[i].selector;
+          const prevSettings = Object.assign({}, shadowDomSettings)
+          shadowDomSettings['selector'] = selectors[i].selector
           if (!prevSettings.hasOwnProperty('selector')) {
-            shadowDomSettings['shadow'] = prevSettings.shadow;
+            shadowDomSettings['shadow'] = prevSettings.shadow
           } else {
-            shadowDomSettings['shadow'] = prevSettings;
+            shadowDomSettings['shadow'] = prevSettings
           }
         }
       }
-      regionSettings = {region: shadowDomSettings};
+      regionSettings = {region: shadowDomSettings}
     }
   }
 
   for (const val of mappedValues) {
     if (config.hasOwnProperty(val)) {
-      delete config[val];
+      delete config[val]
     }
   }
 
-  return Object.assign({}, checkSettings, regionSettings, config);
+  return Object.assign({}, checkSettings, regionSettings, config)
 
   // #region helper functions
 
   function convertPaddedRegion(regions) {
-    if (!regions) return;
-    if (!Array.isArray(regions)) regions = [regions];
-    let resRegions = [];
+    if (!regions) return
+    if (!Array.isArray(regions)) regions = [regions]
+    let resRegions = []
     for (const region of regions) {
       if (region.element || isHTMLElement(region) || region.jquery) {
         if (region.padding || region.regionId) {
-          let currRefElements = refElements(region.element);
+          let currRefElements = refElements(region.element)
           for (const refElement of currRefElements) {
-            let curr = {region: refElement};
+            let curr = {region: refElement}
             if (region.padding) {
-              curr.padding = region.padding;
+              curr.padding = region.padding
             }
             if (region.regionId) {
-              curr.regionId = region.regionId;
+              curr.regionId = region.regionId
             }
-            resRegions.push(curr);
+            resRegions.push(curr)
           }
         } else {
-          resRegions = [...resRegions, ...refElements(region)];
+          resRegions = [...resRegions, ...refElements(region)]
         }
       } else {
         if (region.selector && !region.type) {
-          region.region = region.selector;
-          delete region.selector;
+          region.region = region.selector
+          delete region.selector
         }
-        resRegions.push(region);
+        resRegions.push(region)
       }
     }
-    return resRegions;
+    return resRegions
   }
 
   function convertAccessabilityRegions(accessibilityRegions) {
-    if (!accessibilityRegions) return accessibilityRegions;
-    const accessibility = [];
+    if (!accessibilityRegions) return accessibilityRegions
+    const accessibility = []
 
     accessibilityRegions.map(region => {
       const accessabilityRegion = {
         type: region.accessibilityType,
-      };
+      }
       if (region.hasOwnProperty('selector')) {
-        accessabilityRegion.region = region.selector;
-        accessibility.push(accessabilityRegion);
+        accessabilityRegion.region = region.selector
+        accessibility.push(accessabilityRegion)
       } else if (region.hasOwnProperty('element')) {
-        const elements = refElements(region.element);
+        const elements = refElements(region.element)
         for (const element of elements) {
-          accessibility.push(Object.assign({}, accessabilityRegion, {region: element}));
+          accessibility.push(Object.assign({}, accessabilityRegion, {region: element}))
         }
       } else if (region.hasOwnProperty('region')) {
-        region.type = region.region.accessibilityType;
-        delete region.region.accessibilityType;
-        accessibility.push(region);
+        region.type = region.region.accessibilityType
+        delete region.region.accessibilityType
+        accessibility.push(region)
       } else {
         accessabilityRegion.region = {
           y: region.top,
           x: region.left,
           width: region.width,
           height: region.height,
-        };
-        accessibility.push(accessabilityRegion);
+        }
+        accessibility.push(accessabilityRegion)
       }
-    });
+    })
 
-    return accessibility;
+    return accessibility
   }
 
   function convertFloatingRegion(floatingRegions) {
-    if (!floatingRegions) return floatingRegions;
-    const floating = [];
+    if (!floatingRegions) return floatingRegions
+    const floating = []
 
     for (const region of floatingRegions) {
       const floatingRegion = {
@@ -173,49 +173,47 @@ function eyesCheckMapValues({args, refer}) {
         maxLeftOffset: region.maxLeftOffset || 0,
         maxUpOffset: region.maxUpOffset || 0,
         maxRightOffset: region.maxRightOffset || 0,
-      };
+      }
       if (region.hasOwnProperty('selector')) {
-        floatingRegion.region = region.selector;
-        floating.push(floatingRegion);
+        floatingRegion.region = region.selector
+        floating.push(floatingRegion)
       } else if (region.hasOwnProperty('element')) {
-        const elements = refElements(region.element);
+        const elements = refElements(region.element)
         for (const element of elements) {
-          floating.push(Object.assign({}, floatingRegion, {region: element}));
+          floating.push(Object.assign({}, floatingRegion, {region: element}))
         }
       } else if (region.hasOwnProperty('region')) {
-        floating.push(region);
+        floating.push(region)
       } else {
         floatingRegion.region = {
           y: region.top,
           x: region.left,
           width: region.width,
           height: region.height,
-        };
-        floating.push(floatingRegion);
+        }
+        floating.push(floatingRegion)
       }
     }
-    return floating;
+    return floating
   }
 
   function refElements(regions) {
-    if (!regions) return regions;
-    if (!Array.isArray(regions)) regions = [regions];
-    const elements = [];
+    if (!regions) return regions
+    if (!Array.isArray(regions)) regions = [regions]
+    const elements = []
     for (const region of regions) {
       if (isHTMLElement(region)) {
-        elements.push(Object.assign(refer.ref(region), {type: 'element'}));
+        elements.push(Object.assign(refer.ref(region), {type: 'element'}))
       } else if (region.jquery) {
-        region.each(function() {
+        region.each(function () {
           // there's a small chance that `this` is not an HTML element. So we just verify it.
-          elements.push(
-            isHTMLElement(this) ? Object.assign(refer.ref(this), {type: 'element'}) : this,
-          );
-        });
+          elements.push(isHTMLElement(this) ? Object.assign(refer.ref(this), {type: 'element'}) : this)
+        })
       } else {
-        elements.push(region);
+        elements.push(region)
       }
     }
-    return elements;
+    return elements
   }
 
   // #endregion
@@ -224,7 +222,7 @@ function eyesCheckMapValues({args, refer}) {
 function isHTMLElement(element) {
   // Avoiding instanceof here since the element might come from an iframe, and `instanceof HTMLElement` would fail.
   // This check looks naive, but if anyone passes something like {nodeType: 1} as a region, then I'm fine with them crashing :)
-  return element.nodeType && element.nodeType === Node.ELEMENT_NODE;
+  return element.nodeType && element.nodeType === Node.ELEMENT_NODE
 }
 
-module.exports = {eyesCheckMapValues};
+module.exports = {eyesCheckMapValues}