Fix option test failure.

cypress-io · Jun 19, 2020 · 18b4685 · 18b4685
1 parent 5fa8724
commit 18b4685
Show file tree

Hide file tree

Showing 2 changed files with 56 additions and 12 deletions.
diff --git a/packages/driver/cypress/integration/cy/options_spec.js b/packages/driver/cypress/integration/cy/options_spec.js
@@ -58,33 +58,72 @@ describe('last arg can be an object, but not an option', () => {
     cy.wrap({}).invoke({ log: true }, 'non-exist')
   })
 
-  it('nextUntil', () => {
-    cy.on('log:added', () => {
-      cy.removeAllListeners('log:added')
-      expect(this.logs[0].get('options')).to.deep.eq({})
+  it('nextUntil - jquery', () => {
+    cy.on('log:added', (attrs, log) => {
+      if (log.get('name') === 'nextUntil') {
+        cy.removeAllListeners('log:added')
+        expect(log.get('options')).to.deep.eq({})
+      }
     })
 
     cy.get('div').nextUntil(cy.$$('.warning'))
   })
 
-  it('parentsUntil', () => {
-    cy.on('log:added', () => {
-      cy.removeAllListeners('log:added')
-      expect(this.logs[0].get('options')).to.deep.eq({})
+  it('nextUntil - DOM', () => {
+    cy.on('log:added', (attrs, log) => {
+      if (log.get('name') === 'nextUntil') {
+        cy.removeAllListeners('log:added')
+        expect(log.get('options')).to.deep.eq({})
+      }
+    })
+
+    cy.get('div').nextUntil(document.getElementsByClassName('warning')[0])
+  })
+
+  it('parentsUntil - jquery', () => {
+    cy.on('log:added', (attrs, log) => {
+      if (log.get('name') === 'parentsUntil') {
+        cy.removeAllListeners('log:added')
+        expect(log.get('options')).to.deep.eq({})
+      }
     })
 
     cy.get('div').parentsUntil(cy.$$('.warning'))
   })
 
-  it('prevsUntil', () => {
-    cy.on('log:added', () => {
-      cy.removeAllListeners('log:added')
-      expect(this.logs[0].get('options')).to.deep.eq({})
+  it('parentsUntil - DOM', () => {
+    cy.on('log:added', (attrs, log) => {
+      if (log.get('name') === 'parentsUntil') {
+        cy.removeAllListeners('log:added')
+        expect(log.get('options')).to.deep.eq({})
+      }
+    })
+
+    cy.get('div').parentsUntil(document.getElementsByClassName('warning')[0])
+  })
+
+  it('prevUntil - jquery', () => {
+    cy.on('log:added', (attrs, log) => {
+      if (log.get('name') === 'prevUntil') {
+        cy.removeAllListeners('log:added')
+        expect(log.get('options')).to.deep.eq({})
+      }
     })
 
     cy.get('div').prevUntil(cy.$$('.warning'))
   })
 
+  it('prevUntil - DOM', () => {
+    cy.on('log:added', (attrs, log) => {
+      if (log.get('name') === 'prevUntil') {
+        cy.removeAllListeners('log:added')
+        expect(log.get('options')).to.deep.eq({})
+      }
+    })
+
+    cy.get('div').prevUntil(document.getElementsByClassName('warning')[0])
+  })
+
   it('select', () => {
     cy.on('log:added', (attrs) => {
       if (attrs.name === 'select') {

diff --git a/packages/driver/src/cy/commands/traversals.js b/packages/driver/src/cy/commands/traversals.js
@@ -75,6 +75,11 @@ module.exports = (Commands, Cypress, cy) => {
         options = arg2
       }
 
+      // jQuery or DOM object is not an option
+      if ($dom.isJquery(options) || $dom.isElement(options)) {
+        options = {}
+      }
+
       const userOptions = options || {}
 
       options = _.defaults({}, userOptions, { log: true })