@applitools/core 1.3.7 → 1.3.8

package/dist/ufg/check.js

@@ -34,10 +34,11 @@ const to_base_check_settings_1 = require("../utils/to-base-check-settings");
 const generate_safe_selectors_1 = require("./utils/generate-safe-selectors");
 const abort_error_1 = require("../errors/abort-error");
 const utils = __importStar(require("@applitools/utils"));
+const add_key_to_duplicated_values_in_array_1 = __importDefault(require("./utils/add-key-to-duplicated-values-in-array"));
 const chalk_1 = __importDefault(require("chalk"));
 function makeCheck({ eyes, client, target: defaultTarget, spec, signal, logger: defaultLogger, }) {
     return async function check({ target = defaultTarget, settings = {}, logger = defaultLogger, }) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         logger.log('Command "check" is called with settings', settings);
         if (signal.aborted) {
             logger.warn('Command "check" was called after test was already aborted');
@@ -45,12 +46,13 @@ function makeCheck({ eyes, client, target: defaultTarget, spec, signal, logger:
         }
         const { elementReferencesToCalculate, elementReferenceToTarget, getBaseCheckSettings } = (0, to_base_check_settings_1.toBaseCheckSettings)({ settings });
         let snapshots, snapshotUrl, snapshotTitle, userAgent, regionToTarget, selectorsToCalculate;
+        const uniqueRenderers = (0, add_key_to_duplicated_values_in_array_1.default)((_a = settings.renderers) !== null && _a !== void 0 ? _a : []);
         if ((0, driver_1.isDriver)(target, spec)) {
             const driver = await (0, driver_1.makeDriver)({ spec, driver: target, logger });
-            await driver.currentContext.setScrollingElement((_a = settings.scrollRootElement) !== null && _a !== void 0 ? _a : null);
-            if (driver.isWeb && (!settings.renderers || settings.renderers.length === 0)) {
+            await driver.currentContext.setScrollingElement((_b = settings.scrollRootElement) !== null && _b !== void 0 ? _b : null);
+            if (driver.isWeb && uniqueRenderers.length === 0) {
                 const viewportSize = await driver.getViewportSize();
-                settings.renderers = [{ name: 'chrome', ...viewportSize }];
+                uniqueRenderers.push({ name: 'chrome', ...viewportSize });
             }
             let cleanupGeneratedSelectors;
             if (driver.isWeb) {
@@ -61,7 +63,7 @@ function makeCheck({ eyes, client, target: defaultTarget, spec, signal, logger:
                 });
                 cleanupGeneratedSelectors = generated.cleanupGeneratedSelectors;
                 if (elementReferenceToTarget) {
-                    regionToTarget = (_b = generated.selectors[0]) === null || _b === void 0 ? void 0 : _b.safeSelector;
+                    regionToTarget = (_c = generated.selectors[0]) === null || _c === void 0 ? void 0 : _c.safeSelector;
                     if (!regionToTarget)
                         throw new Error('Target element not found');
                     selectorsToCalculate = generated.selectors.slice(1);
@@ -78,7 +80,7 @@ function makeCheck({ eyes, client, target: defaultTarget, spec, signal, logger:
                     waitBeforeCapture: settings.waitBeforeCapture,
                     disableBrowserFetching: settings.disableBrowserFetching,
                     layoutBreakpoints: settings.layoutBreakpoints,
-                    renderers: settings.renderers,
+                    renderers: uniqueRenderers,
                     skipResources: client.getCachedResourceUrls(),
                 },
                 hooks: {
@@ -104,15 +106,15 @@ function makeCheck({ eyes, client, target: defaultTarget, spec, signal, logger:
             await (cleanupGeneratedSelectors === null || cleanupGeneratedSelectors === void 0 ? void 0 : cleanupGeneratedSelectors());
         }
         else {
-            snapshots = !utils.types.isArray(target) ? Array(settings.renderers.length).fill(target) : target;
+            snapshots = !utils.types.isArray(target) ? Array(uniqueRenderers.length).fill(target) : target;
             snapshotUrl = utils.types.has(snapshots[0], 'url') ? snapshots[0].url : undefined;
         }
-        regionToTarget !== null && regionToTarget !== void 0 ? regionToTarget : (regionToTarget = (_c = elementReferenceToTarget) !== null && _c !== void 0 ? _c : settings.region);
+        regionToTarget !== null && regionToTarget !== void 0 ? regionToTarget : (regionToTarget = (_d = elementReferenceToTarget) !== null && _d !== void 0 ? _d : settings.region);
         selectorsToCalculate !== null && selectorsToCalculate !== void 0 ? selectorsToCalculate : (selectorsToCalculate = elementReferencesToCalculate.map(selector => ({
             originalSelector: selector,
             safeSelector: selector,
         })));
-        const promises = settings.renderers.map(async (renderer, index) => {
+        const promises = uniqueRenderers.map(async (renderer, index) => {
             if (utils.types.has(renderer, 'name') && renderer.name === 'edge') {
                 const message = chalk_1.default.yellow(`The 'edge' option that is being used in your browsers' configuration will soon be deprecated. Please change it to either 'edgelegacy' for the legacy version or to 'edgechromium' for the new Chromium-based version. Please note, when using the built-in BrowserType enum, then the values are BrowserType.EDGE_LEGACY and BrowserType.EDGE_CHROMIUM, respectively.`);
                 logger.console.log(message);
@@ -203,7 +205,7 @@ function makeCheck({ eyes, client, target: defaultTarget, spec, signal, logger:
                 throw error;
             }
         });
-        return settings.renderers.map((renderer, index) => ({
+        return uniqueRenderers.map((renderer, index) => ({
             asExpected: true,
             userTestId: eyes.test.userTestId,
             renderer,

package/dist/ufg/open-eyes.js

@@ -80,7 +80,10 @@ function makeOpenEyes({ core, client, spec, logger: defaultLogger, }) {
                 // check with indexing and storage
                 check: utils.general.wrap((0, check_1.makeCheck)({ eyes, client, target: driver, spec, signal: controller.signal, logger }), async (check, options = {}) => {
                     const results = await check(options);
-                    storage.push(...results.map(result => ({ promise: result.promise, renderer: result.renderer })));
+                    storage.push(...results.map(result => ({
+                        promise: result.promise,
+                        renderer: result.renderer,
+                    })));
                     return results;
                 }),
                 checkAndClose: (0, check_and_close_1.makeCheckAndClose)({ eyes, client, target: driver, spec, signal: controller.signal, logger }),

package/dist/ufg/utils/add-key-to-duplicated-values-in-array.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+function addKeyToDuplicatedValuesInArray(array) {
+    const result = [];
+    const duplicates = new Map();
+    for (const value of array) {
+        let index = 0;
+        const key = JSON.stringify(value);
+        if (duplicates.has(key)) {
+            index = duplicates.get(key) + 1;
+            result.push({ ...value, id: `${typeof value.id !== 'undefined' ? value.id + '-' : ''}${index}` });
+        }
+        else {
+            result.push(value);
+        }
+        duplicates.set(key, index);
+    }
+    return result;
+}
+exports.default = addKeyToDuplicatedValuesInArray;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applitools/core",
-  "version": "1.3.7",
+  "version": "1.3.8",
   "homepage": "https://applitools.com",
   "bugs": {
     "url": "https://github.com/applitools/eyes.sdk.javascript1/issues"
@@ -61,7 +61,7 @@
     }
   },
   "dependencies": {
-    "@applitools/core-base": "1.1.24",
+    "@applitools/core-base": "1.1.25",
     "@applitools/dom-capture": "11.2.0",
     "@applitools/dom-snapshot": "4.7.3",
     "@applitools/driver": "1.11.21",
@@ -70,7 +70,7 @@
     "@applitools/req": "1.1.23",
     "@applitools/screenshoter": "3.7.20",
     "@applitools/snippets": "2.4.12",
-    "@applitools/ufg-client": "1.1.12",
+    "@applitools/ufg-client": "1.1.14",
     "@applitools/utils": "1.3.22",
     "abort-controller": "3.0.0",
     "chalk": "4.1.2",
@@ -80,11 +80,11 @@
   "devDependencies": {
     "@applitools/bongo": "^2.2.0",
     "@applitools/sdk-fake-eyes-server": "^2.1.3",
-    "@applitools/spec-driver-puppeteer": "^1.1.31",
+    "@applitools/spec-driver-puppeteer": "^1.1.32",
     "@applitools/spec-driver-selenium": "^1.5.19",
     "@applitools/spec-driver-webdriverio": "^1.4.18",
     "@applitools/test-server": "^1.1.16",
-    "@applitools/test-utils": "^1.5.5",
+    "@applitools/test-utils": "^1.5.6",
     "@types/mocha": "^9.1.1",
     "@types/node": "12",
     "@types/selenium-webdriver": "^4.1.2",

package/types/ufg/utils/add-key-to-duplicated-values-in-array.d.ts

@@ -0,0 +1,3 @@
+export default function addKeyToDuplicatedValuesInArray<TValue extends {
+    id?: string;
+}>(array: TValue[]): TValue[];