@applitools/eyes-cypress 3.40.6 → 3.40.7

package/CHANGELOG.md

@@ -1,5 +1,53 @@
 # Changelog
 
+## [3.40.7](https://github.com/applitools/eyes.sdk.javascript1/compare/js/eyes-cypress@3.40.6...js/eyes-cypress@3.40.7) (2024-01-30)
+
+
+### Bug Fixes
+
+* losing root context after layout breakpoints reload ([#2113](https://github.com/applitools/eyes.sdk.javascript1/issues/2113)) ([afa1473](https://github.com/applitools/eyes.sdk.javascript1/commit/afa14735e5539ab0f79aa610e6ec1ea8989a5922))
+
+
+### Dependencies
+
+* @applitools/snippets bumped to 2.4.25
+  #### Bug Fixes
+
+  * losing root context after layout breakpoints reload ([#2113](https://github.com/applitools/eyes.sdk.javascript1/issues/2113)) ([afa1473](https://github.com/applitools/eyes.sdk.javascript1/commit/afa14735e5539ab0f79aa610e6ec1ea8989a5922))
+* @applitools/driver bumped to 1.16.2
+  #### Bug Fixes
+
+  * losing root context after layout breakpoints reload ([#2113](https://github.com/applitools/eyes.sdk.javascript1/issues/2113)) ([afa1473](https://github.com/applitools/eyes.sdk.javascript1/commit/afa14735e5539ab0f79aa610e6ec1ea8989a5922))
+
+
+
+* @applitools/spec-driver-webdriver bumped to 1.0.55
+
+* @applitools/spec-driver-selenium bumped to 1.5.69
+
+* @applitools/spec-driver-puppeteer bumped to 1.3.5
+
+* @applitools/screenshoter bumped to 3.8.21
+
+* @applitools/nml-client bumped to 1.6.5
+
+* @applitools/ec-client bumped to 1.7.23
+
+* @applitools/core bumped to 4.7.0
+  #### Features
+
+  * added support of proxy server url env var ([#2159](https://github.com/applitools/eyes.sdk.javascript1/issues/2159)) ([2f69c3d](https://github.com/applitools/eyes.sdk.javascript1/commit/2f69c3d37d7af9be1f459fd3d5f41b361161b5bf))
+
+
+  #### Bug Fixes
+
+  * losing root context after layout breakpoints reload ([#2113](https://github.com/applitools/eyes.sdk.javascript1/issues/2113)) ([afa1473](https://github.com/applitools/eyes.sdk.javascript1/commit/afa14735e5539ab0f79aa610e6ec1ea8989a5922))
+
+
+
+* @applitools/eyes bumped to 1.13.6
+
+
 ## [3.40.6](https://github.com/applitools/eyes.sdk.javascript1/compare/js/eyes-cypress@3.40.5...js/eyes-cypress@3.40.6) (2024-01-16)
 
 

package/dist/browser/spec-driver.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCookies = exports.getUrl = exports.getTitle = exports.findElements = exports.findElement = exports.transformSelector = exports.setViewportSize = exports.getViewportSize = exports.childContext = exports.parentContext = exports.mainContext = exports.executeScript = void 0;
+exports.reload = exports.getCookies = exports.getUrl = exports.getTitle = exports.findElements = exports.findElement = exports.transformSelector = exports.setViewportSize = exports.getViewportSize = exports.childContext = exports.parentContext = exports.mainContext = exports.executeScript = void 0;
 function executeScript(context, script, arg) {
     let scriptToExecute;
     if (script.includes('dom-snapshot') || script.includes('dom-capture') || script.includes('dom-shared')) {
@@ -12,7 +12,7 @@ function executeScript(context, script, arg) {
     }
     if (!context.defaultView) {
         // after reload the window is null
-        context = fallBackToMainContext();
+        context = mainContext();
     }
     const executor = new context.defaultView.Function('arg', scriptToExecute);
     return executor(arg);
@@ -20,7 +20,10 @@ function executeScript(context, script, arg) {
 exports.executeScript = executeScript;
 function mainContext() {
     //@ts-ignore
-    return cy.state('window').document;
+    const win = cy.state('window');
+    // after reload the marker may be lost
+    win.parent.document['applitools-marker'] = 'root-context';
+    return win.document;
 }
 exports.mainContext = mainContext;
 function parentContext(context) {
@@ -30,7 +33,7 @@ function parentContext(context) {
     }
     else if (!context.defaultView) {
         // after reload the window is null
-        return fallBackToMainContext();
+        return mainContext();
     }
     return context === mainContext() ? context : context.defaultView.frameElement.ownerDocument;
 }
@@ -104,7 +107,7 @@ exports.getTitle = getTitle;
 function getUrl(context) {
     if (context && !context.location) {
         // after reload, the location is null
-        context = fallBackToMainContext();
+        context = mainContext();
     }
     return context.location.href;
 }
@@ -114,12 +117,14 @@ function getCookies() {
     return Cypress.automation('get:cookies', {});
 }
 exports.getCookies = getCookies;
-function fallBackToMainContext() {
-    const context = mainContext();
-    //@ts-ignore
-    context['applitools-marker'] = 'root-context';
-    return context;
+function reload() {
+    return new Promise(resolve => {
+        cy.once('window:load', resolve);
+        //@ts-ignore
+        return cy.state('window').location.reload();
+    });
 }
+exports.reload = reload;
 // export function takeScreenshot(page: Driver): Promise<Buffer>;
 // export function visit(page: Driver, url: string): Promise<void>; (??)
 // export function isStaleElementError(err: any): boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applitools/eyes-cypress",
-  "version": "3.40.6",
+  "version": "3.40.7",
   "homepage": "https://applitools.com/docs/api-ref/sdk-api/cypress/",
   "license": "SEE LICENSE IN LICENSE",
   "main": "./index.js",
@@ -42,6 +42,7 @@
     "test:ts:run:13": "yarn cypress13 run --project ./test/e2e/ts --config-file ./cypress-13.config.ts",
     "test:ts:run": "yarn cypress$APPLITOOLS_FRAMEWORK_VERSION run --project ./test/e2e/ts --config-file ./cypress-$APPLITOOLS_FRAMEWORK_VERSION.config.ts",
     "test:coverage": "cd test/generic && yarn && MOCHA_GROUP=coverage APPLITOOLS_BATCH_NAME='JS Coverage Tests: eyes-cypress' APPLITOOLS_BATCH_ID=$(uuidgen) npx cypress run",
+    "test:coverage:chrome": "cd test/generic && yarn && MOCHA_GROUP=coverage APPLITOOLS_BATCH_NAME='JS Coverage Tests: eyes-cypress' APPLITOOLS_BATCH_ID=$(uuidgen) npx cypress run --browser chrome",
     "test:e2e": "MOCHA_GROUP=e2e mkdir -p test/fixtures/testAppCopies && run --top-level mocha --no-timeouts --parallel --jobs ${MOCHA_JOBS:-2} 'test/e2e/**/*.test.js'",
     "test:components": "cd test/components && yarn && npx cypress run --component",
     "cypress": "cypress open --config-file test/fixtures/cypress-play.json",
@@ -53,8 +54,8 @@
     "setup": "run --top-level xvfb:setup"
   },
   "dependencies": {
-    "@applitools/core": "4.6.0",
-    "@applitools/eyes": "1.13.5",
+    "@applitools/core": "4.7.0",
+    "@applitools/eyes": "1.13.6",
     "@applitools/functional-commons": "1.6.0",
     "@applitools/logger": "2.0.14",
     "@applitools/utils": "1.7.0",
@@ -66,7 +67,7 @@
   },
   "devDependencies": {
     "@applitools/api-extractor": "^1.2.22",
-    "@applitools/bongo": "^5.7.6",
+    "@applitools/bongo": "^5.9.0",
     "@applitools/generic": "^3.5.2",
     "@applitools/snaptdout": "^1.0.1",
     "@applitools/test-server": "^1.2.2",

package/src/browser/commands.js

@@ -159,7 +159,6 @@ Cypress.Commands.add('eyesCheckWindow', (args = {}) =>
   cy.then({timeout: 86400000}, () => {
     if (isCurrentTestDisabled) return
 
-    setRootContext()
     const target = refer.ref(cy.state('window').document)
 
     Cypress.log({name: 'Eyes: check window'})
@@ -203,5 +202,5 @@ Cypress.Commands.add('debugHistory', async function () {
 })
 
 function setRootContext() {
-  cy.state('window').document['applitools-marker'] = 'root-context'
+  cy.state('window').parent.document['applitools-marker'] = 'root-context'
 }

package/src/browser/socketCommands.js

@@ -45,6 +45,10 @@ function socketCommands(socket, refer) {
     return await spec.getCookies()
   })
 
+  socket.command('Driver.reload', async () => {
+    await spec.reload()
+  })
+
   // utils
 
   function derefArgs(arg) {

package/src/browser/spec-driver.ts

@@ -13,7 +13,7 @@ export function executeScript(context: Context, script: string, arg: any): any {
   }
   if (!context.defaultView) {
     // after reload the window is null
-    context = fallBackToMainContext()
+    context = mainContext()
   }
   const executor = new context.defaultView.Function('arg', scriptToExecute)
   return executor(arg)
@@ -21,7 +21,10 @@ export function executeScript(context: Context, script: string, arg: any): any {
 
 export function mainContext(): Context {
   //@ts-ignore
-  return cy.state('window').document
+  const win = cy.state('window')
+  // after reload the marker may be lost
+  win.parent.document['applitools-marker'] = 'root-context'
+  return win.document
 }
 
 export function parentContext(context: Context): Context {
@@ -30,7 +33,7 @@ export function parentContext(context: Context): Context {
     throw new Error('Context is not accessible')
   } else if (!context.defaultView) {
     // after reload the window is null
-    return fallBackToMainContext()
+    return mainContext()
   }
 
   return context === mainContext() ? context : context.defaultView.frameElement.ownerDocument
@@ -107,7 +110,7 @@ export function getTitle(context: Context): string {
 export function getUrl(context: Context): string {
   if (context && !context.location) {
     // after reload, the location is null
-    context = fallBackToMainContext()
+    context = mainContext()
   }
   return context.location.href
 }
@@ -117,11 +120,12 @@ export function getCookies(): Array<any> {
   return Cypress.automation('get:cookies', {})
 }
 
-function fallBackToMainContext(): Context {
-  const context = mainContext()
-  //@ts-ignore
-  context['applitools-marker'] = 'root-context'
-  return context
+export function reload(): Promise<void> {
+  return new Promise(resolve => {
+    cy.once('window:load', resolve)
+    //@ts-ignore
+    return cy.state('window').location.reload()
+  })
 }
 
 // export function takeScreenshot(page: Driver): Promise<Buffer>;