@applitools/eyes-cypress 3.60.5 → 3.60.7

package/CHANGELOG.md

@@ -1,5 +1,87 @@
 # Changelog
 
+## [3.60.7](https://github.com/Applitools-Dev/sdk/compare/js/eyes-cypress@3.60.6...js/eyes-cypress@3.60.7) (2026-06-18)
+
+
+### Bug Fixes
+
+* attribute diff failures to correct test when failCypressOnDiff=true | FLD-4628 ([#3923](https://github.com/Applitools-Dev/sdk/issues/3923)) ([0e3af19](https://github.com/Applitools-Dev/sdk/commit/0e3af19421a08d83d35e1d36c0e3879eeabc6378))
+
+
+### Dependencies
+
+* @applitools/utils bumped to 1.15.0
+  #### Features
+
+  * one-time per-execution summary logEvent in storybook | AD-14305 ([#3911](https://github.com/Applitools-Dev/sdk/issues/3911)) ([59e3a5d](https://github.com/Applitools-Dev/sdk/commit/59e3a5dccf74aa1ac1158024316bd305e3515afa))
+* @applitools/req bumped to 1.11.1
+  #### Bug Fixes
+
+  * bundle node-fetch into dist to drop node-domexception dep warning | FLD-4197 ([#3899](https://github.com/Applitools-Dev/sdk/issues/3899)) ([9c3dc52](https://github.com/Applitools-Dev/sdk/commit/9c3dc52866a4a665f1578c39ff43cd0ee5f63492))
+
+
+
+* @applitools/logger bumped to 2.2.13
+
+* @applitools/dom-snapshot bumped to 4.17.4
+
+* @applitools/socket bumped to 1.3.14
+
+* @applitools/image bumped to 1.2.12
+
+* @applitools/dom-capture bumped to 11.8.2
+
+* @applitools/driver bumped to 1.26.4
+
+* @applitools/spec-driver-webdriver bumped to 1.6.4
+
+* @applitools/spec-driver-selenium bumped to 1.8.4
+
+* @applitools/spec-driver-playwright bumped to 1.9.4
+
+* @applitools/spec-driver-puppeteer bumped to 1.8.4
+
+* @applitools/screenshoter bumped to 3.12.23
+
+* @applitools/nml-client bumped to 1.11.33
+
+* @applitools/tunnel-client bumped to 1.12.1
+
+* @applitools/ufg-client bumped to 1.22.4
+
+* @applitools/core-base bumped to 1.35.3
+
+* @applitools/ec-client bumped to 1.12.35
+
+* @applitools/core bumped to 4.65.2
+
+* @applitools/core-universal bumped to 1.0.21
+
+* @applitools/eyes bumped to 1.43.4
+
+* @applitools/test-server bumped to 1.4.5
+
+
+## [3.60.6](https://github.com/Applitools-Dev/sdk/compare/js/eyes-cypress@3.60.5...js/eyes-cypress@3.60.6) (2026-06-15)
+
+
+### Dependencies
+
+* @applitools/core-base bumped to 1.35.2
+  #### Bug Fixes
+
+  * re-trigger release for packages missed in the AD-14089 release | AD-14089 ([#3925](https://github.com/Applitools-Dev/sdk/issues/3925)) ([0880c34](https://github.com/Applitools-Dev/sdk/commit/0880c34b66221025e70ca7e3e3fab7b45a9f8d9e))
+* @applitools/nml-client bumped to 1.11.32
+
+* @applitools/ec-client bumped to 1.12.34
+
+* @applitools/core bumped to 4.65.1
+
+* @applitools/core-universal bumped to 1.0.20
+
+* @applitools/eyes bumped to 1.43.3
+
+
 ## [3.60.5](https://github.com/Applitools-Dev/sdk/compare/js/eyes-cypress@3.60.4...js/eyes-cypress@3.60.5) (2026-06-14)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applitools/eyes-cypress",
-  "version": "3.60.5",
+  "version": "3.60.7",
   "homepage": "https://applitools.com/tutorials/sdks/cypress",
   "license": "SEE LICENSE IN LICENSE",
   "main": "./index.js",
@@ -52,12 +52,12 @@
     "setup": "run --top-level xvfb:setup"
   },
   "dependencies": {
-    "@applitools/core": "4.65.0",
-    "@applitools/core-universal": "1.0.19",
-    "@applitools/eyes": "1.43.2",
+    "@applitools/core": "4.65.2",
+    "@applitools/core-universal": "1.0.21",
+    "@applitools/eyes": "1.43.4",
     "@applitools/functional-commons": "1.6.0",
-    "@applitools/logger": "2.2.12",
-    "@applitools/utils": "1.14.5",
+    "@applitools/logger": "2.2.13",
+    "@applitools/utils": "1.15.0",
     "boxen": "5.1.2",
     "chalk": "3.0.0",
     "semver": "7.6.2",
@@ -69,7 +69,7 @@
     "@applitools/bongo": "^5.10.0",
     "@applitools/generic": "^3.9.2",
     "@applitools/snaptdout": "^1.1.1",
-    "@applitools/test-server": "^1.4.4",
+    "@applitools/test-server": "^1.4.5",
     "@applitools/test-utils": "^1.5.17",
     "@types/he": "^1",
     "@types/node": "^12.20.55",

package/src/browser/commands.js

@@ -1,4 +1,4 @@
-/* global Cypress,cy,after */
+/* global Cypress,cy,after,afterEach */
 'use strict'
 const spec = require('../../dist/browser/spec-driver')
 const Refer = require('../../dist/browser/refer')
@@ -26,10 +26,39 @@ let manager,
   _summary,
   connectedToUniversal,
   openAndGlobalConfig,
-  isOpen = false
+  isOpen = false,
+  // Per-test diff-attribution state: did the current test open Eyes, and has it already been checked.
+  eyesOpenedInTest = false,
+  currentTestHandled = false
 
 const deleteTest = options => socket.request('Core.deleteTest', options)
 
+const DIFFS_OR_ERRORS_MESSAGE = 'Eyes-Cypress detected diffs or errors'
+
+// When per-test attribution is on, throws on a diff/error from within the current test's own execution
+// context so Cypress blames the test that produced it. Called from eyesClose() (after it closes Eyes)
+// and from the afterEach() hook; currentTestHandled makes it run once per test. It does NOT close Eyes —
+// closing would change abort / duplicate-removal semantics for tests that intentionally leave Eyes open,
+// and the results are available from the checks alone.
+async function throwOnDiffForCurrentTest() {
+  if (currentTestHandled || !isOpen) return
+  currentTestHandled = true
+
+  if (!perTestDiffAttribution) return
+
+  // Awaiting the results blocks the test until its UFG render completes — required for correct attribution.
+  const results = await socket.request('Eyes.getResults', {eyes, settings: {throwErr: false}})
+  if (results && results.length > 0) {
+    // TAP files are written once in the after() hook, not here.
+    const resultConfig = makeResultConfig({shouldCreateTapFile: false})
+    const message = await socket.request('Test.printTestResults', {testResults: results, resultConfig})
+    printToLog(`Eyes: per-test diff check message: ${message}`)
+    if (message && message.includes(DIFFS_OR_ERRORS_MESSAGE)) {
+      throw new Error(message)
+    }
+  }
+}
+
 async function getSummary() {
   if (_summary) return _summary
   await Promise.all(closePromiseArr)
@@ -67,6 +96,10 @@ const shouldCallAfterHook =
 
 const notFailCypressAfterAllSpecs = !Cypress.config('appliConfFile').failCypressAfterAllSpecs
 
+// True when diffs are attributed per-test (thrown from the test's own context) instead of batched into
+// the spec-level after() hook.
+const perTestDiffAttribution = Cypress.config('eyesFailCypressOnDiff') && notFailCypressAfterAllSpecs
+
 Cypress.Commands.add('eyesGetAllTestResults', () => {
   Cypress.log({name: 'Eyes: getAllTestResults'})
   printToLog(
@@ -112,12 +145,26 @@ if (shouldCallAfterHook) {
         isCurrentTestDisabled = false
         return
       }
+      // Always finalize results and run post-spec tasks (e.g. writing TAP files) here. With per-test
+      // attribution on, the afterEach() hook below already throws diffs against the correct test, so
+      // suppress the throw here — throwing in this spec-level after() hook would re-blame the last test.
       const summary = await getSummary()
-      await throwErrorIfExistsInSummary(summary, Cypress.config('eyesFailCypressOnDiff'), false)
+      await throwErrorIfExistsInSummary(summary, Cypress.config('eyesFailCypressOnDiff'), false, perTestDiffAttribution)
     })
   })
 }
 
+// With per-test attribution on, check each test's Eyes from an afterEach() hook — which runs in that
+// test's own context — so a diff is blamed on the test that produced it. Covers the common case where
+// the test relies on the SDK's automatic post-spec close. (Does not close Eyes — see throwOnDiffForCurrentTest.)
+if (perTestDiffAttribution) {
+  afterEach(() => {
+    if (!eyesOpenedInTest) return
+    eyesOpenedInTest = false
+    return cy.then({timeout: 86400000}, () => throwOnDiffForCurrentTest())
+  })
+}
+
 let isCurrentTestDisabled
 
 Cypress.Commands.add('eyesOpen', function (args = {}) {
@@ -169,6 +216,8 @@ Cypress.Commands.add('eyesOpen', function (args = {}) {
 
     eyes = await socket.request('EyesManager.openEyes', {manager, target, config: openAndGlobalConfig})
     isOpen = true
+    eyesOpenedInTest = true
+    currentTestHandled = false
   })
 })
 
@@ -191,22 +240,25 @@ Cypress.Commands.add('eyesCheckWindow', (args = {}) => {
 })
 
 Cypress.Commands.add('eyesClose', () => {
-  return cy.then({timeout: 86400000}, () => {
-    if (isCurrentTestDisabled) return
-    if (!isOpen) throw new EyesNotOpenError('eyesClose')
-
-    Cypress.log({name: 'Eyes: close'})
+  return cy.then({timeout: 86400000}, async () => {
     if (isCurrentTestDisabled) {
       isCurrentTestDisabled = false
       return
     }
+    if (!isOpen) throw new EyesNotOpenError('eyesClose')
 
-    // Eyes.close in core is not waiting on results anymore. So we should return it in order to await it
+    Cypress.log({name: 'Eyes: close'})
+
+    // Eyes.close in core no longer waits on results, so await it explicitly.
     const p = socket.request('Eyes.close', {eyes, config: openAndGlobalConfig}).catch(err => {
       console.log('Error in cy.eyesClose', err)
     })
     closePromiseArr.push(p)
-    return p
+    await p
+
+    // Run the per-test diff check inside the test's own context (the afterEach() hook does the same for
+    // tests that don't call eyesClose(); currentTestHandled prevents doing it twice).
+    await throwOnDiffForCurrentTest()
   })
 })
 
@@ -243,15 +295,24 @@ function isNonVisualTestError(testResult) {
   return result
 }
 
-async function throwErrorIfExistsInSummary(summary, shouldThrowError, shouldDisplayCriticalErrors) {
-  const resultConfig = {
+function makeResultConfig({shouldThrowError = true, shouldCreateTapFile}) {
+  return {
     showLogs: Cypress.config('appliConfFile').showLogs,
-    shouldThrowError: shouldThrowError,
+    shouldThrowError,
     isTextTerminal: Cypress.config('isTextTerminal'),
     tapDirPath: Cypress.config('appliConfFile').tapDirPath,
     tapFileName: Cypress.config('appliConfFile').tapFileName,
-    shouldCreateTapFile: shouldDoPostSpecTasks,
+    shouldCreateTapFile,
   }
+}
+
+async function throwErrorIfExistsInSummary(
+  summary,
+  shouldThrowError,
+  shouldDisplayCriticalErrors,
+  suppressDiffThrow = false,
+) {
+  const resultConfig = makeResultConfig({shouldThrowError, shouldCreateTapFile: shouldDoPostSpecTasks})
   const testResults = summary.results?.map(({result}) => result) ?? []
   const filteredTestResults = shouldDisplayCriticalErrors
     ? testResults.filter(testResult => testResult.error && isNonVisualTestError(testResult))
@@ -263,9 +324,10 @@ async function throwErrorIfExistsInSummary(summary, shouldThrowError, shouldDisp
     }, results message: ${message}`,
   )
   if (
-    (!!getGlobalConfigProperty('eyesFailCypressOnDiff') &&
+    (!suppressDiffThrow &&
+      !!getGlobalConfigProperty('eyesFailCypressOnDiff') &&
       message &&
-      message.includes('Eyes-Cypress detected diffs or errors')) ||
+      message.includes(DIFFS_OR_ERRORS_MESSAGE)) ||
     (shouldDisplayCriticalErrors && filteredTestResults.length > 0 && message)
   ) {
     printToLog('Eyes: throwErrorIfExistsInSummary throwing error')