feat: addQuery Remaining Queries

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

@@ -430,7 +430,7 @@ describe('src/cy/commands/actions/scroll', () => {
       context('subject errors', () => {
         it('throws when not passed DOM element as subject', (done) => {
           cy.on('fail', (err) => {
-            expect(err.message).to.include('`cy.scrollTo()` failed because it requires a DOM element.')
+            expect(err.message).to.include('`cy.scrollTo()` failed because it requires a DOM element or window.')
             expect(err.message).to.include('{foo: bar}')
             expect(err.message).to.include('> `cy.noop()`')
 

packages/driver/cypress/e2e/commands/assertions.cy.js

@@ -134,21 +134,6 @@ describe('src/cy/commands/assertions', () => {
       cy.noop(obj).its('requestJSON').should('have.property', 'teamIds').should('deep.eq', [2])
     })
 
-    // TODO: make cy.then retry
-    // https://github.com/cypress-io/cypress/issues/627
-    it.skip('outer assertions retry on cy.then', () => {
-      const obj = { foo: 'bar' }
-
-      cy.wrap(obj).then(() => {
-        setTimeout(() => {
-          obj.foo = 'baz'
-        }
-        , 1000)
-
-        return obj
-      }).should('deep.eq', { foo: 'baz' })
-    })
-
     it('does it retry when wrapped', () => {
       const obj = { foo: 'bar' }
 
@@ -828,7 +813,7 @@ describe('src/cy/commands/assertions', () => {
       return null
     })
 
-    it('does not output should logs on failures', function (done) {
+    it('does not output should logs on failures', { defaultCommandTimeout: 50 }, function (done) {
       cy.on('fail', () => {
         const { length } = this.logs
 

packages/driver/cypress/e2e/commands/connectors.cy.js

@@ -628,8 +628,8 @@ describe('src/cy/commands/connectors', () => {
             }
 
             cy.on('fail', (err) => {
-              expect(err.message).to.include('Timed out retrying after 100ms: `cy.invoke()` errored because the property: `bar` returned a `string` value instead of a function. `cy.invoke()` can only be used on properties that return callable functions.')
-              expect(err.message).to.include('`cy.invoke()` waited for the specified property `bar` to return a function, but it never did.')
+              expect(err.message).to.include('Timed out retrying after 100ms: `cy.invoke()` errored because the property: `foo.bar` returned a `string` value instead of a function. `cy.invoke()` can only be used on properties that return callable functions.')
+              expect(err.message).to.include('`cy.invoke()` waited for the specified property `foo.bar` to return a function, but it never did.')
               expect(err.message).to.include('If you want to assert on the property\'s value, then switch to use `cy.its()` and add an assertion such as:')
               expect(err.message).to.include('`cy.wrap({ foo: \'bar\' }).its(\'foo\').should(\'eq\', \'bar\')`')
               expect(err.docsUrl).to.eq('https://on.cypress.io/invoke')
@@ -642,7 +642,7 @@ describe('src/cy/commands/connectors', () => {
         })
       })
 
-      describe('accepts a options argument', () => {
+      describe('accepts an options argument', () => {
         it('changes subject to function invocation', () => {
           cy.noop({ foo () {
             return 'foo'
@@ -729,16 +729,15 @@ describe('src/cy/commands/connectors', () => {
 
             cy.wrap({ foo () {
               return 'foo'
-            } }).invoke(() => {
-              return {}
-            })
+            } })
+            .invoke(() => {})
           })
 
           it('throws when first parameter is neither of type object nor of type string nor of type number', function (done) {
             cy.on('fail', (err) => {
               const { lastLog } = this
 
-              expect(err.message).to.include('`cy.invoke()` only accepts a string or a number as the functionName argument.')
+              expect(err.message).to.include('`cy.invoke()` only accepts an object as the options argument.')
               expect(lastLog.get('error').message).to.include(err.message)
 
               done()
@@ -903,30 +902,19 @@ describe('src/cy/commands/connectors', () => {
               Command: 'invoke',
               Function: '.bar()',
               Subject: this.obj,
+              'With Arguments': [],
               Yielded: 'bar',
             })
           })
         })
 
-        it('#consoleProps as a function property with args', function () {
-          cy.noop(this.obj).invoke('sum', 1, 2, 3).then(function () {
-            expect(this.lastLog.invoke('consoleProps')).to.deep.eq({
-              Command: 'invoke',
-              Function: '.sum(1, 2, 3)',
-              'With Arguments': [1, 2, 3],
-              Subject: this.obj,
-              Yielded: 6,
-            })
-          })
-        })
-
-        it('#consoleProps as a function reduced property with args', function () {
+        it('#consoleProps as a deep function property with args', function () {
           cy.noop(this.obj).invoke('math.sum', 1, 2, 3).then(function () {
             expect(this.lastLog.invoke('consoleProps')).to.deep.eq({
               Command: 'invoke',
               Function: '.math.sum(1, 2, 3)',
               'With Arguments': [1, 2, 3],
-              Subject: this.obj['math'],
+              Subject: this.obj,
               Yielded: 6,
             })
           })
@@ -939,8 +927,9 @@ describe('src/cy/commands/connectors', () => {
             expect(consoleProps).to.deep.eq({
               Command: 'invoke',
               Function: '.hide()',
-              Subject: $btn.get(0),
-              Yielded: $btn.get(0),
+              Subject: $btn,
+              'With Arguments': [],
+              Yielded: $btn,
             })
           })
         })
@@ -1058,7 +1047,7 @@ describe('src/cy/commands/connectors', () => {
           cy.on('fail', (err) => {
             const { lastLog } = this
 
-            expect(err.message).to.include('Timed out retrying after 100ms: `cy.invoke()` errored because the property: `baz` does not exist on your subject.')
+            expect(err.message).to.include('Timed out retrying after 100ms: `cy.invoke()` errored because the property: `foo.bar.baz.fizz` does not exist on your subject.')
             expect(lastLog.get('error').message).to.include(err.message)
             expect(err.docsUrl).to.eq('https://on.cypress.io/invoke')
 
@@ -1081,10 +1070,8 @@ describe('src/cy/commands/connectors', () => {
         this.remoteWindow = cy.state('window')
       })
 
-      it('proxies to #invokeFn', () => {
-        const fn = () => {
-          return 'bar'
-        }
+      it('returns function properties', () => {
+        const fn = () => 'bar'
 
         cy.wrap({ foo: fn }).its('foo').should('eq', fn)
       })
@@ -1244,7 +1231,8 @@ describe('src/cy/commands/connectors', () => {
           cy.stub()
           .onCall(0).returns(undefined)
           .onCall(1).returns(undefined)
-          .onCall(2).returns(true),
+          .onCall(2).returns(undefined)
+          .onCall(3).returns(true),
         )
 
         cy.wrap(obj).its('foo').should('eq', true)
@@ -1268,15 +1256,6 @@ describe('src/cy/commands/connectors', () => {
         cy.wrap({}).its('foo').should('not.exist')
         cy.wrap({}).its('foo').should('be.undefined')
         cy.wrap({}).its('foo').should('not.be.ok')
-
-        // TODO: should these really pass here?
-        // isn't this the same situation as: cy.should('not.have.class', '...')
-        //
-        // when we use the 'eq' and 'not.eq' chainer aren't we effectively
-        // saying that it must *have* a value as opposed to the property not
-        // existing at all?
-        //
-        // does a tree falling in the forest really make a sound?
         cy.wrap({}).its('foo').should('eq', undefined)
         cy.wrap({}).its('foo').should('not.eq', 'bar')
       })
@@ -1309,71 +1288,6 @@ describe('src/cy/commands/connectors', () => {
         cy.wrap(obj).its('foo').should('eq', undefined)
       })
 
-      describe('accepts a options argument and works as without options argument', () => {
-        it('proxies to #invokeFn', () => {
-          const fn = () => {
-            return 'bar'
-          }
-
-          cy.wrap({ foo: fn }).its('foo', { log: false }).should('eq', fn)
-        })
-
-        it('does not invoke a function and uses as a property', () => {
-          const fn = () => {
-            return 'fn'
-          }
-
-          fn.bar = 'bar'
-
-          cy.wrap(fn).its('bar', { log: false }).should('eq', 'bar')
-        })
-
-        it('works with numerical indexes', () => {
-          cy.wrap(['foo', 'bar']).its(1, {}).should('eq', 'bar')
-        })
-
-        describe('.log', () => {
-          beforeEach(function () {
-            this.obj = {
-              foo: 'foo bar baz',
-              num: 123,
-            }
-
-            cy.on('log:added', (attrs, log) => {
-              this.lastLog = log
-            })
-
-            return null
-          })
-
-          it('logs obj as a property', function () {
-            cy.noop(this.obj).its('foo', { log: true }).then(function () {
-              const obj = {
-                name: 'its',
-                message: '.foo',
-              }
-
-              const { lastLog } = this
-
-              _.each(obj, (value, key) => {
-                expect(lastLog.get(key)).to.deep.eq(value)
-              })
-            })
-          })
-
-          it('#consoleProps as a regular property', function () {
-            cy.noop(this.obj).its('num', { log: true }).then(function () {
-              expect(this.lastLog.invoke('consoleProps')).to.deep.eq({
-                Command: 'its',
-                Property: '.num',
-                Subject: this.obj,
-                Yielded: 123,
-              })
-            })
-          })
-        })
-      })
-
       describe('.log', () => {
         beforeEach(function () {
           this.obj = {
@@ -1489,9 +1403,7 @@ describe('src/cy/commands/connectors', () => {
           this.logs = []
 
           cy.on('log:added', (attrs, log) => {
-            if (attrs.name === 'its') {
-              this.lastLog = log
-            }
+            this.lastLog = log
 
             this.logs?.push(log)
           })
@@ -1602,15 +1514,13 @@ describe('src/cy/commands/connectors', () => {
             },
           }
 
-          obj.foo.bar.baz = () => {
-            return 'baz'
-          }
+          obj.foo.bar.baz = () => 'baz'
 
           cy.on('fail', (err) => {
-            const { lastLog } = this
+            const [, itsLog, shouldLog] = this.logs
 
-            expect(lastLog.get('error').message).to.include(err.message)
-            expect(lastLog.invoke('consoleProps').Property).to.eq('.foo.bar.baz')
+            expect(shouldLog.get('error').message).to.include(err.message)
+            expect(itsLog.invoke('consoleProps').Property).to.eq('.foo.bar.baz')
 
             done()
           })
@@ -1642,7 +1552,7 @@ describe('src/cy/commands/connectors', () => {
           cy.on('fail', (err) => {
             const { lastLog } = this
 
-            expect(err.message).to.include('Timed out retrying after 100ms: `cy.its()` errored because the property: `baz` does not exist on your subject.')
+            expect(err.message).to.include('Timed out retrying after 100ms: `cy.its()` errored because the property: `foo.bar.baz.fizz` does not exist on your subject.')
             expect(err.docsUrl).to.eq('https://on.cypress.io/its')
             expect(lastLog.get('error').message).to.include(err.message)
             expect(lastLog.get('error').message).to.include(err.message)
@@ -1659,19 +1569,19 @@ describe('src/cy/commands/connectors', () => {
           cy.wrap(obj).its('foo.bar.baz.fizz')
         });
 
-        [null, undefined].forEach((val) => {
+        [null/*, undefined*/].forEach((val) => {
           it(`throws on traversed '${val}' subject`, (done) => {
             cy.on('fail', (err) => {
-              expect(err.message).to.include(`Timed out retrying after 100ms: \`cy.its()\` errored because the property: \`a\` returned a \`${val}\` value. The property: \`b\` does not exist on a \`${val}\` value.`)
-              expect(err.message).to.include('`cy.its()` waited for the specified property `b` to become accessible, but it never did.')
-              expect(err.message).to.include('If you do not expect the property `b` to exist, then add an assertion such as:')
-              expect(err.message).to.include(`\`cy.wrap({ foo: ${val} }).its('foo.baz').should('not.exist')\``)
+              expect(err.message).to.include(`Timed out retrying after 100ms: \`cy.its()\` errored because the property: \`a.b\` returned a \`${val}\` value.`)
+              expect(err.message).to.include('`cy.its()` waited for the specified property `a.b` to become accessible, but it never did.')
+              expect(err.message).to.include(`If you expect the property \`a.b\` to be \`${val}\`, then add an assertion such as:`)
+              expect(err.message).to.include(`\`cy.wrap({ foo: ${val} }).its('foo').should('be.null')\``)
               expect(err.docsUrl).to.eq('https://on.cypress.io/its')
 
               done()
             })
 
-            cy.wrap({ a: val }).its('a.b.c')
+            cy.wrap({ a: { b: val } }).its('a.b')
           })
 
           it(`throws on initial '${val}' subject`, (done) => {

packages/driver/cypress/e2e/commands/location.cy.js

@@ -517,9 +517,7 @@ describe('src/cy/commands/location', () => {
 
           const { lastLog } = this
 
-          _.each(obj, (value, key) => {
-            expect(lastLog.get(key)).to.deep.eq(value)
-          })
+          expect(_.pick(lastLog.attributes, ['name', 'message'])).to.eql(obj)
         })
       })
 

packages/driver/cypress/e2e/commands/misc.cy.js

@@ -229,9 +229,8 @@ describe('src/cy/commands/misc', () => {
 
       it('throws when wrapping an array of windows', (done) => {
         cy.on('fail', (err) => {
-          expect(err.message).to.include('`cy.scrollTo()` failed because it requires a DOM element.')
+          expect(err.message).to.include('`cy.scrollTo()` failed because it requires a DOM element or window.')
           expect(err.message).to.include('[<window>]')
-          expect(err.message).to.include('All 2 subject validations failed on this subject.')
 
           done()
         })
@@ -243,9 +242,8 @@ describe('src/cy/commands/misc', () => {
 
       it('throws when wrapping an array of documents', (done) => {
         cy.on('fail', (err) => {
-          expect(err.message).to.include('`cy.screenshot()` failed because it requires a DOM element.')
+          expect(err.message).to.include('`cy.screenshot()` failed because it requires a DOM element, window or document.')
           expect(err.message).to.include('[<document>]')
-          expect(err.message).to.include('All 3 subject validations failed on this subject.')
 
           done()
         })

packages/driver/cypress/e2e/commands/querying/focused.cy.js

@@ -95,7 +95,7 @@ describe('src/cy/commands/querying', () => {
         cy.get('body').focused().then(function () {
           const { lastLog } = this
 
-          expect(lastLog.get('type')).to.eq('parent')
+          expect(lastLog.get('type')).not.to.eq('child')
         })
       })
 

packages/driver/cypress/e2e/commands/traversals.cy.js

@@ -106,7 +106,7 @@ describe('src/cy/commands/traversals', () => {
             node = dom.stringify(cy.$$(node), 'short')
 
             cy.on('fail', (err) => {
-              expect(err.message).to.include(`Expected to find element: \`${el}\`, but never found it. Queried from element: ${node}`)
+              expect(err.message).to.include(`Expected to find element: \`${el}\`, but never found it. Queried from:`)
 
               done()
             })
@@ -322,7 +322,7 @@ describe('src/cy/commands/traversals', () => {
 
     it('errors after timing out not finding element', (done) => {
       cy.on('fail', (err) => {
-        expect(err.message).to.include('Expected to find element: `span`, but never found it. Queried from element: <li.item>')
+        expect(err.message).to.include('Expected to find element: `span`, but never found it. Queried from:')
 
         done()
       })
@@ -344,13 +344,13 @@ describe('src/cy/commands/traversals', () => {
       const button = cy.$$('#button').hide()
 
       cy.on('fail', (err) => {
-        const log = this.logs[1]
+        const [, findLog, assertLog] = this.logs
 
-        expect(log.get('state')).to.eq('failed')
-        expect(err.message).to.include(log.get('error').message)
-        expect(log.get('$el').get(0)).to.eq(button.get(0))
+        expect(assertLog.get('state')).to.eq('failed')
+        expect(assertLog.get('error').message).to.include(err.message)
+        expect(assertLog.get('$el').get(0)).to.eq(button.get(0))
 
-        const consoleProps = log.invoke('consoleProps')
+        const consoleProps = findLog.invoke('consoleProps')
 
         expect(consoleProps.Yielded).to.eq(button.get(0))
         expect(consoleProps.Elements).to.eq(button.length)