Merge branch 'develop' into fix-driver-retries

packages/driver/cypress/integration/commands/xhr_spec.js

@@ -1660,6 +1660,33 @@ describe('src/cy/commands/xhr', () => {
       })
     })
 
+    // https://github.com/cypress-io/cypress/issues/18858
+    it('can stub headers', (done) => {
+      cy
+      .route({
+        url: '/foo',
+        response: '',
+        headers: {
+          'some-header': 'header-value',
+        },
+      }).as('getFoo')
+      .window().then((win) => {
+        win.$.ajax({
+          url: '/foo',
+          error (_a, _b, err) {
+            done(`Errored but should not have: ${err.stack}`)
+          },
+        })
+
+        return null
+      })
+      .wait('@getFoo')
+      .then((xhr) => {
+        expect(xhr.response.headers['some-header']).to.equal('header-value')
+        done()
+      })
+    })
+
     // https://github.com/cypress-io/cypress/issues/2372
     it('warns if a percent-encoded URL is used', () => {
       cy.spy(Cypress.utils, 'warning')

packages/driver/src/cypress/server.ts

@@ -200,8 +200,7 @@ export class Server {
     this.setHeader(xhr, 'response', route.response, responser)
     this.setHeader(xhr, 'matched', `${route.url}`)
     this.setHeader(xhr, 'delay', route.delay)
-
-    return this.setHeader(xhr, 'headers', route.headers, this.transformHeaders)
+    this.setHeader(xhr, 'headers', route.headers, this.transformHeaders.bind(this))
   }
 
   route (attrs = {}) {