Merge pull request #20817 from sainthkh/issue-19985

fix: cy.root respect timeout option.
cypress-io · Mar 30, 2022 · 085add5 · 085add5 · cypress-bot · Mar 30, 2022
2 parents 4869a61 + a95eff5
commit 085add5
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/packages/driver/cypress/integration/commands/querying/root_spec.js b/packages/driver/cypress/integration/commands/querying/root_spec.js
@@ -35,6 +35,16 @@ describe('src/cy/commands/querying', () => {
       cy.root().should('have.class', 'foo').and('have.class', 'bar')
     })
 
+    // https://github.com/cypress-io/cypress/issues/19985
+    it('respects timeout option', (done) => {
+      cy.on('fail', (err) => {
+        expect(err.message).to.not.contain('4000ms')
+        done()
+      })
+
+      cy.root({ timeout: 50 }).should('contain', 'root world')
+    })
+
     describe('.log', () => {
       beforeEach(function () {
         this.logs = []

diff --git a/packages/driver/src/cy/commands/querying/root.ts b/packages/driver/src/cy/commands/querying/root.ts
@@ -29,7 +29,10 @@ export default (Commands, Cypress, cy, state) => {
         return log(withinSubject)
       }
 
-      return cy.now('get', 'html', { log: false }).then(log)
+      return cy.now('get', 'html', {
+        log: false,
+        timeout: options.timeout,
+      }).then(log)
     },
   })
 }