test: add test to check atf takes precedence over efd for impacted tests

calvinbayer · calvinbayer · commit 14f60c812747 · 2026-01-20T16:05:40.000+01:00
diff --git a/integration-tests/jest/jest.spec.js b/integration-tests/jest/jest.spec.js
@@ -4167,7 +4167,7 @@ describe(`jest@${JEST_VERSION} commonJS`, () => {
         ])
       })
 
-      it('attempt to fix takes precedence over EFD', async () => {
+      it('attempt to fix takes precedence over EFD for new tests', async () => {
         const NUM_RETRIES_EFD = 2
         receiver.setKnownTests({ jest: {} })
         receiver.setSettings({
@@ -5080,6 +5080,75 @@ describe(`jest@${JEST_VERSION} commonJS`, () => {
         runImpactedTest(done, { isModified: true })
       })
 
+      it('attempt to fix takes precedence over EFD for impacted tests', async () => {
+        const NUM_RETRIES_EFD = 2
+        receiver.setSettings({
+          impacted_tests_enabled: true,
+          test_management: { enabled: true, attempt_to_fix_retries: 2 },
+          early_flake_detection: {
+            enabled: true,
+            slow_test_retries: {
+              '5s': NUM_RETRIES_EFD
+            },
+            faulty_session_threshold: 100
+          },
+          known_tests_enabled: true
+        })
+        receiver.setTestManagementTests({
+          jest: {
+            suites: {
+              'ci-visibility/test-impacted-test/test-impacted-1.js': {
+                tests: {
+                  'impacted tests can pass normally': {
+                    properties: {
+                      attempt_to_fix: true
+                    }
+                  }
+                }
+              }
+            }
+          }
+        })
+
+        const eventsPromise = receiver
+          .gatherPayloadsMaxTimeout(({ url }) => url.endsWith('/api/v2/citestcycle'), (payloads) => {
+            const events = payloads.flatMap(({ payload }) => payload.events)
+            const tests = events.filter(event => event.type === 'test').map(event => event.content)
+            const impactedAtfTests = tests.filter(test =>
+              test.meta[TEST_SOURCE_FILE] === 'ci-visibility/test-impacted-test/test-impacted-1.js' &&
+              test.meta[TEST_NAME] === 'impacted tests can pass normally'
+            )
+
+            assert.strictEqual(impactedAtfTests.length, 3)
+            const atfRetries = impactedAtfTests.filter(
+              test => test.meta[TEST_RETRY_REASON] === TEST_RETRY_REASON_TYPES.atf
+            )
+            const efdRetries = impactedAtfTests.filter(
+              test => test.meta[TEST_RETRY_REASON] === TEST_RETRY_REASON_TYPES.efd
+            )
+            assert.strictEqual(atfRetries.length, 2)
+            assert.strictEqual(efdRetries.length, 0)
+          })
+
+        childProcess = exec(
+          runTestsCommand,
+          {
+            cwd,
+            env: {
+              ...getCiVisAgentlessConfig(receiver.port),
+              TESTS_TO_RUN: 'test-impacted-test/test-impacted-1',
+              GITHUB_BASE_REF: ''
+            },
+            stdio: 'inherit'
+          }
+        )
+
+        await Promise.all([
+          once(childProcess, 'exit'),
+          eventsPromise
+        ])
+      })
+
       it('should not be detected as impacted if disabled', (done) => {
         receiver.setSettings({ impacted_tests_enabled: false })
 
