@applitools/eyes-cypress 3.24.0-beta.5 → 3.25.0

package/src/browser/spec-driver.ts

@@ -1,112 +1,118 @@
-type EyesSelector = {selector: string; type?: string}
-export type Selector = (string | EyesSelector) & {__applitoolsBrand?: never};
-export type Context = Document & {__applitoolsBrand?: never};
-export type Element = HTMLElement & {__applitoolsBrand?: never};
-
-export function executeScript(context: Context, script: string, arg: any): any {     
-  context = refreshContext(context)
-
-      let scriptToExecute;
-      if (
-        script.includes('dom-snapshot') ||
-        script.includes('dom-capture') ||
-        script.includes('dom-shared')
-        ) {
-            scriptToExecute = script
-        } else {
-            const prepScirpt = script.replace('function(arg)', 'function func(arg)')
-            scriptToExecute = prepScirpt.concat(' return func(arg)')
-        }
-
-        const executor = new context.defaultView.Function('arg', scriptToExecute);
-        return executor(arg)
-}
-
-export function mainContext(): Context {
-  //@ts-ignore
-  return cy.state('window').document
-}
-
-export function parentContext(context: Context): Context {
-  if (!context) return; // because Cypress doesn't support cross origin iframe, then childContext might return null, and then the input to parentContext might be null
-  
-  return context === mainContext() ? context : context.defaultView.frameElement.ownerDocument
-}
-
-export function childContext(_context: Context, element: HTMLIFrameElement): Context {
-  return element.contentDocument // null in case of cross origin iframe
-}
-
-export function getViewportSize(): Object {
-  //@ts-ignore
-  const currWindow = cy.state('window')
-  const viewportSize = {
-    width: Math.max(currWindow.document.documentElement.clientWidth || 0, currWindow.innerWidth || 0),
-    height: Math.max(currWindow.document.documentElement.clientHeight || 0, currWindow.innerHeight || 0)
-  };
-  return viewportSize;
-}
-
-export function setViewportSize(vs: any): void {
-  //@ts-ignore
-  Cypress.action('cy:viewport:changed', { viewportWidth: vs.size.width, viewportHeight: vs.size.height });
-}
-
-export function transformSelector(selector: Selector): Selector {
-  if (selector.hasOwnProperty('selector') && (!selector.hasOwnProperty('type') || (selector as EyesSelector).type === 'css')) {
-    return (selector as EyesSelector).selector
-  }
-  return selector
-}
-
-export function findElement(context: Context, selector: Selector, parent?: Element) {
-  context = refreshContext(context)
-  const eyesSelector = (selector as EyesSelector)
-  const root = parent ?? context
-  const sel = typeof selector === 'string' ? selector : eyesSelector.selector
-  if (typeof selector !== 'string' && eyesSelector.type === 'xpath') {
-    return context.evaluate(sel, context, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue;
-  } else {
-    return root.querySelector(sel)
-  }
-}
-
-export function findElements(context: Context, selector: Selector, parent: Element){
-  context = refreshContext(context)
-  const eyesSelector = (selector as EyesSelector)
-  const root = parent ?? context
-  const sel = typeof selector === 'string' ? selector : eyesSelector.selector
-  if (typeof selector !== 'string' && eyesSelector.type === 'xpath') {
-    // TODO return multiple
-    return context.evaluate(sel, context, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue;
-  } else {
-    return root.querySelectorAll(sel)
-  }
-}
-
-export function getTitle(context: Context): string {
-  context = refreshContext(context)
-  return context.title
-}
-
-export function getUrl(context: Context): string {
-  context = refreshContext(context)
-  return context.location.href
-}
-
-export function getCookies(): Array<any> {
-  //@ts-ignore
-  return Cypress.automation('get:cookies', {})
-}
-
-// we need to method to reset the context in case the user called open before visit
-function refreshContext(context: Context) {
-  //@ts-ignore
-  return (context && context.defaultView) ? context : cy.state('window').document
-}
-
-// export function takeScreenshot(page: Driver): Promise<Buffer>;
-
-// export function visit(page: Driver, url: string): Promise<void>; (??)
-
+type EyesSelector = {selector: string; type?: string}
+export type Selector = (string | EyesSelector) & {__applitoolsBrand?: never};
+export type Context = Document & {__applitoolsBrand?: never};
+export type Element = HTMLElement & {__applitoolsBrand?: never};
+
+export function executeScript(context: Context, script: string, arg: any): any {     
+  context = refreshContext(context)
+
+      let scriptToExecute;
+      if (
+        script.includes('dom-snapshot') ||
+        script.includes('dom-capture') ||
+        script.includes('dom-shared')
+        ) {
+            scriptToExecute = script
+        } else {
+            const prepScirpt = script.replace('function(arg)', 'function func(arg)')
+            scriptToExecute = prepScirpt.concat(' return func(arg)')
+        }
+
+        const executor = new context.defaultView.Function('arg', scriptToExecute);
+        return executor(arg)
+}
+
+export function mainContext(): Context {
+  //@ts-ignore
+  return cy.state('window').document
+}
+
+export function parentContext(context: Context): Context {
+  if (!context) return; // because Cypress doesn't support cross origin iframe, then childContext might return null, and then the input to parentContext might be null
+  
+  return context === mainContext() ? context : context.defaultView.frameElement.ownerDocument
+}
+
+export function childContext(_context: Context, element: HTMLIFrameElement): Context {
+  return element.contentDocument // null in case of cross origin iframe
+}
+
+export function getViewportSize(): Object {
+  //@ts-ignore
+  const currWindow = cy.state('window')
+  const viewportSize = {
+    width: Math.max(currWindow.document.documentElement.clientWidth || 0, currWindow.innerWidth || 0),
+    height: Math.max(currWindow.document.documentElement.clientHeight || 0, currWindow.innerHeight || 0)
+  };
+  return viewportSize;
+}
+
+export function setViewportSize(vs: any): void {
+  //@ts-ignore
+  Cypress.action('cy:viewport:changed', { viewportWidth: vs.size.width, viewportHeight: vs.size.height });
+}
+
+export function transformSelector(selector: Selector): Selector {
+  if (selector.hasOwnProperty('selector') && (!selector.hasOwnProperty('type') || (selector as EyesSelector).type === 'css')) {
+    return (selector as EyesSelector).selector
+  }
+  return selector
+}
+
+export function findElement(context: Context, selector: Selector, parent?: Element) {
+  context = refreshContext(context)
+  const eyesSelector = (selector as EyesSelector)
+  const root = parent ?? context
+  const sel = typeof selector === 'string' ? selector : eyesSelector.selector
+  if (typeof selector !== 'string' && eyesSelector.type === 'xpath') {
+    return context.evaluate(sel, context, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue;
+  } else {
+    return root.querySelector(sel)
+  }
+}
+
+export function findElements(context: Context, selector: Selector, parent: Element){
+  context = refreshContext(context)
+  const eyesSelector = (selector as EyesSelector)
+  const root = parent ?? context
+  const sel = typeof selector === 'string' ? selector : eyesSelector.selector
+  if (typeof selector !== 'string' && eyesSelector.type === 'xpath') {
+    const results = [];
+    const queryResult = document.evaluate(sel, context,
+        null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null);
+
+    for (let i = 0; i < queryResult.snapshotLength; i++) {
+        results.push(queryResult.snapshotItem(i));
+    }
+    return results;
+  } else {
+    return root.querySelectorAll(sel)
+  }
+}
+
+export function getTitle(context: Context): string {
+  context = refreshContext(context)
+  return context.title
+}
+
+export function getUrl(context: Context): string {
+  context = refreshContext(context)
+  return context.location.href
+}
+
+export function getCookies(): Array<any> {
+  //@ts-ignore
+  return Cypress.automation('get:cookies', {})
+}
+
+// we need to method to reset the context in case the user called open before visit
+function refreshContext(context: Context) {
+  //@ts-ignore
+  return (context && context.defaultView) ? context : cy.state('window').document
+}
+
+// export function takeScreenshot(page: Driver): Promise<Buffer>;
+
+// export function visit(page: Driver, url: string): Promise<void>; (??)
+
 // export function isStaleElementError(err: any): boolean;

package/src/pem/server.cert

@@ -1,22 +1,22 @@
------BEGIN CERTIFICATE-----
-MIIDsDCCApigAwIBAgIJANJbHwoHZzbBMA0GCSqGSIb3DQEBCwUAMG0xCzAJBgNV
-BAYTAkNBMRIwEAYDVQQIDAlTYW4gTWF0ZW8xEzARBgNVBAoMCkFwcGxpdG9vbHMx
-NTAzBgNVBAMMLFNlbGYgc2lnbmVkIHNlcnZlciBmb3IgY3lwcmVzcyBleWVzIGNv
-bW1hbmRzMB4XDTE5MDExMzA5MDU0MloXDTM5MDEwODA5MDU0MlowbTELMAkGA1UE
-BhMCQ0ExEjAQBgNVBAgMCVNhbiBNYXRlbzETMBEGA1UECgwKQXBwbGl0b29sczE1
-MDMGA1UEAwwsU2VsZiBzaWduZWQgc2VydmVyIGZvciBjeXByZXNzIGV5ZXMgY29t
-bWFuZHMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDCCGfKHFApw+Cf
-TPi8r6UG8pPI6KFNrNKCZfI0K1GNEVu5csdAaFMgPCpq+UgR87jJqra1z6LXUDWd
-Hw7i0eAvY2k86RsQyQ8VdmOuf5MOXwJrCjlVITRbBjP3bmCcJuYgLZeDLN28JNwE
-SBlbhAGPepDXnQGUQkpmGTisX5LXQ9V4azVJ2mMuweKIgYUVIORVaGyELdg62OOo
-ShQna2olFsa6XLB5crTJMrplFCrb+aSc/X+P+LXET4jlz6i2gt4MwGMeJ0zELYOz
-Dr7AhvuzmeoYYhJdVVeDYbTsYEYgAZ10UnpUcaXE3PnCIOz91dpTiXEtafH2HM1n
-BUr652YRAgMBAAGjUzBRMB0GA1UdDgQWBBRGWnmO6FmZVz32pEXykD8HTw4x6TAf
-BgNVHSMEGDAWgBRGWnmO6FmZVz32pEXykD8HTw4x6TAPBgNVHRMBAf8EBTADAQH/
-MA0GCSqGSIb3DQEBCwUAA4IBAQC98pfQnfmXfkDpffQVa+ms4xRNvqG5kDZn7BQd
-x0X0Td+7vNVGI2HDUnANo/X+jNzOeu5Rvk7fgZmQbLB6zZUAkz6J1DOCIAtY2DWF
-94YRam6rXu2J2QN8xnD/qLVlTNJMcy+O7QD2aIPkYJQUvrxcNE8phLX8L8qQGink
-O5I8zzH6RY/x6GkgLEez7u4wphXliiYgT1E3NI2g6SrIVMRjYW/Dt4/QsOcImaBN
-+qI6+Fc4Nm/ZaiGwwjy/hapn8zbX5jyDx9k89BAb199noXllYCvHQ8C1ak4oT1nS
-WoDAnRJRoMIEgara3fhU+R+vrdJuyf1awbmoXarrIu1mP6Na
------END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIDsDCCApigAwIBAgIJANJbHwoHZzbBMA0GCSqGSIb3DQEBCwUAMG0xCzAJBgNV
+BAYTAkNBMRIwEAYDVQQIDAlTYW4gTWF0ZW8xEzARBgNVBAoMCkFwcGxpdG9vbHMx
+NTAzBgNVBAMMLFNlbGYgc2lnbmVkIHNlcnZlciBmb3IgY3lwcmVzcyBleWVzIGNv
+bW1hbmRzMB4XDTE5MDExMzA5MDU0MloXDTM5MDEwODA5MDU0MlowbTELMAkGA1UE
+BhMCQ0ExEjAQBgNVBAgMCVNhbiBNYXRlbzETMBEGA1UECgwKQXBwbGl0b29sczE1
+MDMGA1UEAwwsU2VsZiBzaWduZWQgc2VydmVyIGZvciBjeXByZXNzIGV5ZXMgY29t
+bWFuZHMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDCCGfKHFApw+Cf
+TPi8r6UG8pPI6KFNrNKCZfI0K1GNEVu5csdAaFMgPCpq+UgR87jJqra1z6LXUDWd
+Hw7i0eAvY2k86RsQyQ8VdmOuf5MOXwJrCjlVITRbBjP3bmCcJuYgLZeDLN28JNwE
+SBlbhAGPepDXnQGUQkpmGTisX5LXQ9V4azVJ2mMuweKIgYUVIORVaGyELdg62OOo
+ShQna2olFsa6XLB5crTJMrplFCrb+aSc/X+P+LXET4jlz6i2gt4MwGMeJ0zELYOz
+Dr7AhvuzmeoYYhJdVVeDYbTsYEYgAZ10UnpUcaXE3PnCIOz91dpTiXEtafH2HM1n
+BUr652YRAgMBAAGjUzBRMB0GA1UdDgQWBBRGWnmO6FmZVz32pEXykD8HTw4x6TAf
+BgNVHSMEGDAWgBRGWnmO6FmZVz32pEXykD8HTw4x6TAPBgNVHRMBAf8EBTADAQH/
+MA0GCSqGSIb3DQEBCwUAA4IBAQC98pfQnfmXfkDpffQVa+ms4xRNvqG5kDZn7BQd
+x0X0Td+7vNVGI2HDUnANo/X+jNzOeu5Rvk7fgZmQbLB6zZUAkz6J1DOCIAtY2DWF
+94YRam6rXu2J2QN8xnD/qLVlTNJMcy+O7QD2aIPkYJQUvrxcNE8phLX8L8qQGink
+O5I8zzH6RY/x6GkgLEez7u4wphXliiYgT1E3NI2g6SrIVMRjYW/Dt4/QsOcImaBN
++qI6+Fc4Nm/ZaiGwwjy/hapn8zbX5jyDx9k89BAb199noXllYCvHQ8C1ak4oT1nS
+WoDAnRJRoMIEgara3fhU+R+vrdJuyf1awbmoXarrIu1mP6Na
+-----END CERTIFICATE-----

package/src/pem/server.key

@@ -1,27 +1,27 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEogIBAAKCAQEAwghnyhxQKcPgn0z4vK+lBvKTyOihTazSgmXyNCtRjRFbuXLH
-QGhTIDwqavlIEfO4yaq2tc+i11A1nR8O4tHgL2NpPOkbEMkPFXZjrn+TDl8Cawo5
-VSE0WwYz925gnCbmIC2XgyzdvCTcBEgZW4QBj3qQ150BlEJKZhk4rF+S10PVeGs1
-SdpjLsHiiIGFFSDkVWhshC3YOtjjqEoUJ2tqJRbGulyweXK0yTK6ZRQq2/mknP1/
-j/i1xE+I5c+otoLeDMBjHidMxC2Dsw6+wIb7s5nqGGISXVVXg2G07GBGIAGddFJ6
-VHGlxNz5wiDs/dXaU4lxLWnx9hzNZwVK+udmEQIDAQABAoIBAFwNiNAGJrHp0AND
-jS5XVj+5jgte8kfbmfNrUkEV3BbFCXMt1QHlfKpqYOVnZp29twlWCGCxJVxpHUZx
-mapaT7WrwB25qbGI8bMI+7mppKbIxGjr7M9KdYBJrRXSM9thSQQzHRKKkpfUFN2j
-JwSX1/Wt/FGOl1UzLgDKLmz42r1tCZPGlomMOW+Fs3TFtcro1iTlGQz7kvfWXxrF
-V5by7uFJIAkypFFMen0stqDH6eaNNFXrwdm6Sj6B/VOSz0HG+FSTAia0vt17dsqm
-2KLJIVWuTPibt5gb2C+X9GpHztTCbziYF6n4Cfp3dF1jBrKK6yM7LwH1RJVpYy2H
-tU+4dZECgYEA56uMFRZmuiFL+S+oDBVfe6GWwzgHwZ2h/4uBB2lDPULtUv+av/3C
-sthzfkRvw5EgBDQfpWgco/y0pCtfs9Wm5Occ461krTWu3ymVjrtsANPIdywZaj9I
-p+UfDR2jJoAmxlOPHm2s5vPGu+y/Zlxt1mHmn+WMcAhJ45F98eItOMMCgYEA1mj6
-1m0yOlQtmIFh3cYIV11W1R29KMx/UqGbSMev6pWfP3nrnzvz4yp835omTt4bkhcf
-U+9xEMCOHcILSQ3cx3xLeW6pWXyPJAJUX2Y2+SvmX5lypYRZSg2DE0mVKjEV7M6Q
-cKqIo+vqrcVhOpJf9y43ZkzNnLczxNuILlHBWJsCgYAyOmZPuCCjoE55g1Sa8hNW
-ma03PDGqT8PsxNE/yxmx8Y3E3fguQhVxcy5vJOVacF+Rqb9mvFDhWQvNQD4qnlrl
-7Bm+XzyhtS7p4Xk0jfwXndMry1rjRz84b5uw20khMs21WC6CeWLwW9AttGG3Drkd
-rvIynrE5JQLoHQZCaDhHwwKBgCPgUQiMIPltmGuKSqvnNQIZViw22631+eADto4J
-C8B+5LSkW+67A2Yhd9+aVYqg05AwWkebKxoYfi8wht7keOrQO3jIMYINu43U7fVA
-jzZGSDf63xoe+SnQ9PvHNjRnHjoPnk+b2V1EXnJRMqGwWGpty0tM0qLEbN8ltLW7
-bFS9AoGARqPSEW0PpLxW5m8fnfPRVWwpTuhhWm0fkw13O8cUVIVf3E6g+MF2I9wf
-v8yPDFyh5myoCzy8aFy4eSFeWzYTahsLDq03EyYuqIGoTJrcls9dmpxhRdPjwywJ
-Yll894/fpK2lWI54kCEh+jRE3+S+4D3zi2txta/tu7Z891eQ5sI=
------END RSA PRIVATE KEY-----
+-----BEGIN RSA PRIVATE KEY-----
+MIIEogIBAAKCAQEAwghnyhxQKcPgn0z4vK+lBvKTyOihTazSgmXyNCtRjRFbuXLH
+QGhTIDwqavlIEfO4yaq2tc+i11A1nR8O4tHgL2NpPOkbEMkPFXZjrn+TDl8Cawo5
+VSE0WwYz925gnCbmIC2XgyzdvCTcBEgZW4QBj3qQ150BlEJKZhk4rF+S10PVeGs1
+SdpjLsHiiIGFFSDkVWhshC3YOtjjqEoUJ2tqJRbGulyweXK0yTK6ZRQq2/mknP1/
+j/i1xE+I5c+otoLeDMBjHidMxC2Dsw6+wIb7s5nqGGISXVVXg2G07GBGIAGddFJ6
+VHGlxNz5wiDs/dXaU4lxLWnx9hzNZwVK+udmEQIDAQABAoIBAFwNiNAGJrHp0AND
+jS5XVj+5jgte8kfbmfNrUkEV3BbFCXMt1QHlfKpqYOVnZp29twlWCGCxJVxpHUZx
+mapaT7WrwB25qbGI8bMI+7mppKbIxGjr7M9KdYBJrRXSM9thSQQzHRKKkpfUFN2j
+JwSX1/Wt/FGOl1UzLgDKLmz42r1tCZPGlomMOW+Fs3TFtcro1iTlGQz7kvfWXxrF
+V5by7uFJIAkypFFMen0stqDH6eaNNFXrwdm6Sj6B/VOSz0HG+FSTAia0vt17dsqm
+2KLJIVWuTPibt5gb2C+X9GpHztTCbziYF6n4Cfp3dF1jBrKK6yM7LwH1RJVpYy2H
+tU+4dZECgYEA56uMFRZmuiFL+S+oDBVfe6GWwzgHwZ2h/4uBB2lDPULtUv+av/3C
+sthzfkRvw5EgBDQfpWgco/y0pCtfs9Wm5Occ461krTWu3ymVjrtsANPIdywZaj9I
+p+UfDR2jJoAmxlOPHm2s5vPGu+y/Zlxt1mHmn+WMcAhJ45F98eItOMMCgYEA1mj6
+1m0yOlQtmIFh3cYIV11W1R29KMx/UqGbSMev6pWfP3nrnzvz4yp835omTt4bkhcf
+U+9xEMCOHcILSQ3cx3xLeW6pWXyPJAJUX2Y2+SvmX5lypYRZSg2DE0mVKjEV7M6Q
+cKqIo+vqrcVhOpJf9y43ZkzNnLczxNuILlHBWJsCgYAyOmZPuCCjoE55g1Sa8hNW
+ma03PDGqT8PsxNE/yxmx8Y3E3fguQhVxcy5vJOVacF+Rqb9mvFDhWQvNQD4qnlrl
+7Bm+XzyhtS7p4Xk0jfwXndMry1rjRz84b5uw20khMs21WC6CeWLwW9AttGG3Drkd
+rvIynrE5JQLoHQZCaDhHwwKBgCPgUQiMIPltmGuKSqvnNQIZViw22631+eADto4J
+C8B+5LSkW+67A2Yhd9+aVYqg05AwWkebKxoYfi8wht7keOrQO3jIMYINu43U7fVA
+jzZGSDf63xoe+SnQ9PvHNjRnHjoPnk+b2V1EXnJRMqGwWGpty0tM0qLEbN8ltLW7
+bFS9AoGARqPSEW0PpLxW5m8fnfPRVWwpTuhhWm0fkw13O8cUVIVf3E6g+MF2I9wf
+v8yPDFyh5myoCzy8aFy4eSFeWzYTahsLDq03EyYuqIGoTJrcls9dmpxhRdPjwywJ
+Yll894/fpK2lWI54kCEh+jRE3+S+4D3zi2txta/tu7Z891eQ5sI=
+-----END RSA PRIVATE KEY-----

package/src/plugin/concurrencyMsg.js

@@ -1,8 +1,8 @@
-'use strict';
-const chalk = require('chalk');
-const MSG = `
-Important notice: Your Applitools visual tests are currently running with a testConcurrency value of 5.
-This means that only up to 5 visual tests can run in parallel, and therefore the execution might be slower.
-If your Applitools license supports a higher concurrency level, learn how to configure it here: https://www.npmjs.com/package/@applitools/eyes-cypress#concurrency.
-Need a higher concurrency in your account? Email us @ sdr@applitools.com with your required concurrency level.`;
-module.exports = {concurrencyMsg: chalk.yellow(MSG), msgText: MSG};
+'use strict';
+const chalk = require('chalk');
+const MSG = `
+Important notice: Your Applitools visual tests are currently running with a testConcurrency value of 5.
+This means that only up to 5 visual tests can run in parallel, and therefore the execution might be slower.
+If your Applitools license supports a higher concurrency level, learn how to configure it here: https://www.npmjs.com/package/@applitools/eyes-cypress#concurrency.
+Need a higher concurrency in your account? Email us @ sdr@applitools.com with your required concurrency level.`;
+module.exports = {concurrencyMsg: chalk.yellow(MSG), msgText: MSG};

package/src/plugin/config.js

@@ -1,54 +1,54 @@
-'use strict';
-const {configParams, ConfigUtils, TypeUtils} = require('@applitools/visual-grid-client');
-const DEFAULT_TEST_CONCURRENCY = 5;
-const uuid = require('uuid');
-
-function makeConfig() {
-  const config = ConfigUtils.getConfig({
-    configParams: [
-      ...configParams,
-      'failCypressOnDiff',
-      'tapDirPath',
-      'tapFileName',
-      'disableBrowserFetching',
-      'testConcurrency',
-    ],
-  });
-
-  if (!config.batch || !config.batch.id) {
-    config.batch = {id: uuid.v4(), ...config.batch};
-  }
-  if (config.failCypressOnDiff === '0') {
-    config.failCypressOnDiff = false;
-  }
-
-  if (TypeUtils.isString(config.showLogs)) {
-    config.showLogs = config.showLogs === 'true' || config.showLogs === '1';
-  }
-
-  if (TypeUtils.isString(config.testConcurrency)) {
-    config.testConcurrency = Number(config.testConcurrency);
-  }
-
-  if (config.accessibilityValidation) {
-    config.accessibilitySettings = config.accessibilityValidation;
-    delete config.accessiblityValidation;
-  }
-
-  const eyesConfig = {
-    tapDirPath: config.tapDirPath,
-    tapFileName: config.tapFileName,
-    eyesIsDisabled: !!config.isDisabled,
-    eyesBrowser: JSON.stringify(config.browser),
-    eyesLayoutBreakpoints: JSON.stringify(config.layoutBreakpoints),
-    eyesFailCypressOnDiff:
-      config.failCypressOnDiff === undefined ? true : !!config.failCypressOnDiff,
-    eyesDisableBrowserFetching: !!config.disableBrowserFetching,
-    eyesTestConcurrency: config.testConcurrency || DEFAULT_TEST_CONCURRENCY,
-    eyesWaitBeforeCapture: config.waitBeforeCapture,
-  };
-
-  return {config, eyesConfig};
-}
-
-module.exports = makeConfig;
+'use strict';
+const {configParams, ConfigUtils, TypeUtils} = require('@applitools/visual-grid-client');
+const DEFAULT_TEST_CONCURRENCY = 5;
+const uuid = require('uuid');
+
+function makeConfig() {
+  const config = ConfigUtils.getConfig({
+    configParams: [
+      ...configParams,
+      'failCypressOnDiff',
+      'tapDirPath',
+      'tapFileName',
+      'disableBrowserFetching',
+      'testConcurrency',
+    ],
+  });
+
+  if (!config.batch || !config.batch.id) {
+    config.batch = {id: uuid.v4(), ...config.batch};
+  }
+  if (config.failCypressOnDiff === '0') {
+    config.failCypressOnDiff = false;
+  }
+
+  if (TypeUtils.isString(config.showLogs)) {
+    config.showLogs = config.showLogs === 'true' || config.showLogs === '1';
+  }
+
+  if (TypeUtils.isString(config.testConcurrency)) {
+    config.testConcurrency = Number(config.testConcurrency);
+  }
+
+  if (config.accessibilityValidation) {
+    config.accessibilitySettings = config.accessibilityValidation;
+    delete config.accessiblityValidation;
+  }
+
+  const eyesConfig = {
+    tapDirPath: config.tapDirPath,
+    tapFileName: config.tapFileName,
+    eyesIsDisabled: !!config.isDisabled,
+    eyesBrowser: JSON.stringify(config.browser),
+    eyesLayoutBreakpoints: JSON.stringify(config.layoutBreakpoints),
+    eyesFailCypressOnDiff:
+      config.failCypressOnDiff === undefined ? true : !!config.failCypressOnDiff,
+    eyesDisableBrowserFetching: !!config.disableBrowserFetching,
+    eyesTestConcurrency: config.testConcurrency || DEFAULT_TEST_CONCURRENCY,
+    eyesWaitBeforeCapture: config.waitBeforeCapture,
+  };
+
+  return {config, eyesConfig};
+}
+
+module.exports = makeConfig;

package/src/plugin/defaultPort.js

@@ -1 +1 @@
-module.exports = 7373;
+module.exports = 7373;

package/src/plugin/errorDigest.js

@@ -1,96 +1,96 @@
-'use strict';
-
-const colors = {
-  green: '\x1b[32m',
-  red: '\x1b[31m',
-  teal: '\x1b[38;5;86m',
-  orange: '\x1b[38;5;214m',
-  reset: '\x1b[0m',
-};
-
-const formatByStatus = {
-  Passed: {
-    color: 'green',
-    symbol: '\u2713',
-    title: tests => `Passed - ${tests} tests`,
-  },
-  Failed: {
-    color: 'red',
-    symbol: '\u2716',
-    title: tests => `Errors - ${tests} tests`,
-  },
-  Unresolved: {
-    color: 'orange',
-    symbol: '\u26A0',
-    title: tests => `Diffs detected - ${tests} tests`,
-  },
-};
-
-function errorDigest({passed, failed, diffs, logger, isInteractive}) {
-  logger.log('errorDigest: diff errors', diffs);
-  logger.log('errorDigest: test errors', failed);
-
-  const testResultsUrl = diffs.length ? colorify(diffs[0].getUrl(), 'teal') : '';
-  const testResultsPrefix = testResultsUrl ? 'See details at:' : '';
-  const footer = testResultsUrl
-    ? `\n${indent()}${colorify(testResultsPrefix)} ${testResultsUrl}`
-    : '';
-  return (
-    colorify('Eyes-Cypress detected diffs or errors during execution of visual tests.') +
-    colorify(` ${testResultsPrefix} ${testResultsUrl}`) +
-    testResultsToString(passed, 'Passed') +
-    testResultsToString(diffs, 'Unresolved') +
-    testResultsToString(failed, 'Failed') +
-    footer +
-    '\n\n'
-  );
-
-  function testResultsToString(testResultsArr, category) {
-    const {color, title, symbol, chalkFunction} = formatByStatus[category];
-    const results = testResultsArr.reduce((acc, testResults) => {
-      if (!testResults.isEmpty) {
-        const error = hasError(testResults) ? stringifyError(testResults) : undefined;
-        acc.push(
-          `${colorify(symbol, color)} ${colorify(error || stringifyTestResults(testResults))}`,
-        );
-      }
-      return acc;
-    }, []);
-
-    const coloredTitle = results.length
-      ? colorify(title(results.length), color, chalkFunction)
-      : '';
-    return testResultsSection(coloredTitle, results);
-  }
-
-  function colorify(msg, color = 'reset') {
-    return isInteractive ? msg : `${colors[color]}${msg}${colors.reset}`;
-  }
-}
-
-function stringifyTestResults(testResults) {
-  const hostDisplaySize = testResults.getHostDisplaySize();
-  const viewport = hostDisplaySize ? `[${hostDisplaySize}]` : '';
-  const testName = `${testResults.getName()} ${viewport}`;
-  return testName + (testResults.error ? ` : ${testResults.error}` : '');
-}
-
-function testResultsSection(title, results) {
-  return results.length ? `${indent()}${title}${indent(3)}${results.join(indent(3))}` : '';
-}
-
-function stringifyError(testResults) {
-  return testResults.error
-    ? stringifyTestResults(testResults)
-    : `[Eyes test not started] : ${testResults}`;
-}
-
-function indent(spaces = 2) {
-  return `\n   ${'  '.repeat(spaces)}`;
-}
-
-function hasError(testResult) {
-  return testResult.error || testResult instanceof Error;
-}
-
-module.exports = errorDigest;
+'use strict';
+
+const colors = {
+  green: '\x1b[32m',
+  red: '\x1b[31m',
+  teal: '\x1b[38;5;86m',
+  orange: '\x1b[38;5;214m',
+  reset: '\x1b[0m',
+};
+
+const formatByStatus = {
+  Passed: {
+    color: 'green',
+    symbol: '\u2713',
+    title: tests => `Passed - ${tests} tests`,
+  },
+  Failed: {
+    color: 'red',
+    symbol: '\u2716',
+    title: tests => `Errors - ${tests} tests`,
+  },
+  Unresolved: {
+    color: 'orange',
+    symbol: '\u26A0',
+    title: tests => `Diffs detected - ${tests} tests`,
+  },
+};
+
+function errorDigest({passed, failed, diffs, logger, isInteractive}) {
+  logger.log('errorDigest: diff errors', diffs);
+  logger.log('errorDigest: test errors', failed);
+
+  const testResultsUrl = diffs.length ? colorify(diffs[0].getUrl(), 'teal') : '';
+  const testResultsPrefix = testResultsUrl ? 'See details at:' : '';
+  const footer = testResultsUrl
+    ? `\n${indent()}${colorify(testResultsPrefix)} ${testResultsUrl}`
+    : '';
+  return (
+    colorify('Eyes-Cypress detected diffs or errors during execution of visual tests.') +
+    colorify(` ${testResultsPrefix} ${testResultsUrl}`) +
+    testResultsToString(passed, 'Passed') +
+    testResultsToString(diffs, 'Unresolved') +
+    testResultsToString(failed, 'Failed') +
+    footer +
+    '\n\n'
+  );
+
+  function testResultsToString(testResultsArr, category) {
+    const {color, title, symbol, chalkFunction} = formatByStatus[category];
+    const results = testResultsArr.reduce((acc, testResults) => {
+      if (!testResults.isEmpty) {
+        const error = hasError(testResults) ? stringifyError(testResults) : undefined;
+        acc.push(
+          `${colorify(symbol, color)} ${colorify(error || stringifyTestResults(testResults))}`,
+        );
+      }
+      return acc;
+    }, []);
+
+    const coloredTitle = results.length
+      ? colorify(title(results.length), color, chalkFunction)
+      : '';
+    return testResultsSection(coloredTitle, results);
+  }
+
+  function colorify(msg, color = 'reset') {
+    return isInteractive ? msg : `${colors[color]}${msg}${colors.reset}`;
+  }
+}
+
+function stringifyTestResults(testResults) {
+  const hostDisplaySize = testResults.getHostDisplaySize();
+  const viewport = hostDisplaySize ? `[${hostDisplaySize}]` : '';
+  const testName = `${testResults.getName()} ${viewport}`;
+  return testName + (testResults.error ? ` : ${testResults.error}` : '');
+}
+
+function testResultsSection(title, results) {
+  return results.length ? `${indent()}${title}${indent(3)}${results.join(indent(3))}` : '';
+}
+
+function stringifyError(testResults) {
+  return testResults.error
+    ? stringifyTestResults(testResults)
+    : `[Eyes test not started] : ${testResults}`;
+}
+
+function indent(spaces = 2) {
+  return `\n   ${'  '.repeat(spaces)}`;
+}
+
+function hasError(testResult) {
+  return testResult.error || testResult instanceof Error;
+}
+
+module.exports = errorDigest;