fix: actionability not retrying in after hooks where the test failed

cli/CHANGELOG.md

@@ -3,6 +3,10 @@
 
 _Released 2/11/2025 (PENDING)_
 
+**Bugfixes:**
+
+- All commands performed in `after` and `afterEach` hooks will now correctly retry when a test fails. Commands that are actions like `.click()` and `.type()` will now perform the action in this situation also. Fixes [#2831](https://github.com/cypress-io/cypress/issues/2831).
+
 **Dependency Updates:**
 
 - Upgraded `mime` from `2.6.0` to `3.0.0`. Addressed in [#30966](https://github.com/cypress-io/cypress/pull/30966).

packages/driver/cypress/e2e/commands/actions/click.cy.js

@@ -1723,6 +1723,52 @@ describe('src/cy/commands/actions/click', () => {
           cy.get('#dom').invoke('css', 'scrollBehavior').then((scrollBehavior) => expect(scrollBehavior).to.eq('smooth'))
         })
       })
+
+      describe('retries in after hook when failures', () => {
+        it('clicks element in hook', () => {
+          cy.on('fail', (err) => {
+            expect(err.message).contain('expected true to be false')
+          })
+
+          expect(true).to.be.false
+        })
+
+        after(() => {
+          const onClick = cy.stub()
+
+          const $button = cy.$$('#button')
+
+          $button.on('click', onClick)
+
+          cy.get('#button').click().then(() => {
+            expect(onClick).to.be.calledOnce
+          })
+        })
+      })
+
+      describe('retries in afterEach hook when failures', () => {
+        it('clicks element in hook', () => {
+          cy.on('fail', (err) => {
+            expect(err.message).contain('expected true to be false')
+
+            return false
+          })
+
+          expect(true).to.be.false
+        })
+
+        afterEach(() => {
+          const onClick = cy.stub()
+
+          const $button = cy.$$('#button')
+
+          $button.on('click', onClick)
+
+          cy.get('#button').click().then(() => {
+            expect(onClick).to.be.calledOnce
+          })
+        })
+      })
     })
 
     describe('assertion verification', () => {

packages/driver/cypress/e2e/commands/actions/type.cy.js

@@ -478,6 +478,50 @@ describe('src/cy/commands/actions/type - #type', () => {
 
       cy.get(':text:first').type('foo', { scrollBehavior: false, timeout: 200 })
     })
+
+    describe('retries in after hook when failures', () => {
+      it('types in element in hook', () => {
+        cy.on('fail', (err) => {
+          expect(err.message).contain('expected true to be false')
+        })
+
+        expect(true).to.be.false
+      })
+
+      after(() => {
+        const input = cy.$$('input:text:first')
+
+        input.val('')
+
+        expect(input).to.have.value('')
+
+        cy.get('input:text:first').type('foo').then(($input) => {
+          expect($input).to.have.value('foo')
+        })
+      })
+    })
+
+    describe('retries in afterEach hook when failures', () => {
+      it('types in element in hook', () => {
+        cy.on('fail', (err) => {
+          expect(err.message).contain('expected true to be false')
+        })
+
+        expect(true).to.be.false
+      })
+
+      afterEach(() => {
+        const input = cy.$$('input:text:first')
+
+        input.val('')
+
+        expect(input).to.have.value('')
+
+        cy.get('input:text:first').type('foo').then(($input) => {
+          expect($input).to.have.value('foo')
+        })
+      })
+    })
   })
 
   describe('input types where no extra formatting required', () => {

packages/driver/src/cy/retries.ts

@@ -105,8 +105,7 @@ export const create = (Cypress: ICypress, state: StateFunc, timeout: $Cy['timeou
     const ended = () => {
       // we should NOT retry if
       // 1. our promise has been canceled
-      // 2. or we have an error
-      // 3. or if the runnables has changed
+      // 2. or if the runnables has changed
 
       // although bluebird SHOULD cancel these retries
       // since they're all connected - apparently they
@@ -116,7 +115,7 @@ export const create = (Cypress: ICypress, state: StateFunc, timeout: $Cy['timeou
       // bug in bluebird with not propagating cancellations
       // fast enough in a series of promises
       // https://github.com/petkaantonov/bluebird/issues/1424
-      return state('canceled') || state('error') || runnableHasChanged()
+      return state('canceled') || runnableHasChanged()
     }
 
     return Promise