[test optimization] Fix cypress attempt to fix (#7767)

juan-fernandez · web-flow · commit 545939da0a80 · 2026-03-16T13:26:10.000+01:00
diff --git a/integration-tests/cypress/cypress.spec.js b/integration-tests/cypress/cypress.spec.js
@@ -540,7 +540,7 @@ moduleTypes.forEach(({
           assert.ok(jsInvocationDetailsEvent, 'plain-js invocationDetails test event should exist')
           assert.strictEqual(
             jsInvocationDetailsEvent.content.metrics[TEST_SOURCE_START],
-            246,
+            244,
             'should keep invocationDetails line directly for plain JS specs without source maps'
           )
           assert.ok(
@@ -2975,11 +2975,9 @@ moduleTypes.forEach(({
             testAssertionsPromise,
           ])
 
-          if (shouldAlwaysPass) {
+          if (shouldAlwaysPass || isQuarantined || isDisabled) {
             assert.strictEqual(exitCode, 0)
           } else {
-            // TODO: we need to figure out how to trick cypress into returning exit code 0
-            // even if there are failed tests
             assert.strictEqual(exitCode, 1)
           }
         }
@@ -3018,9 +3016,6 @@ moduleTypes.forEach(({
          * TODO:
          * The spec says that quarantined tests that are not attempted to fix should be run and their result ignored.
          * Cypress will skip the test instead.
-         *
-         * When a test is quarantined and attempted to fix, the spec is to run the test and ignore its result.
-         * Cypress will run the test, but it won't ignore its result.
          */
         it('can mark tests as quarantined and tests are not skipped', async () => {
           receiver.setSettings({ test_management: { enabled: true, attempt_to_fix_retries: 3 } })
diff --git a/packages/datadog-plugin-cypress/src/support.js b/packages/datadog-plugin-cypress/src/support.js
@@ -61,18 +61,16 @@ Cypress.on('fail', (err, runnable) => {
   }
 
   const testName = runnable.fullTitle()
-  const { isQuarantined, isAttemptToFix } = getTestProperties(testName)
+  const { isQuarantined, isDisabled } = getTestProperties(testName)
 
-  // For pure quarantined tests (not attemptToFix), suppress the failure
-  // This makes the test "pass" from Cypress's perspective while we still track the error
-  if (isQuarantined && !isAttemptToFix) {
-    // Store the error so we can report it to Datadog in afterEach
+  // Suppress failures for quarantined or disabled tests so they don't affect the exit code.
+  // This applies regardless of attempt-to-fix status: per spec, quarantined/disabled test
+  // results are always ignored.
+  if (isQuarantined || isDisabled) {
     quarantinedTestErrors.set(testName, err)
-    // Don't re-throw - this prevents Cypress from marking the test as failed
     return
   }
 
-  // For all other tests (including attemptToFix), let the error propagate normally
   throw err
 })
 
