Merge branch 'develop' into issue-4318-empty-array-clear-select

Author: davidmunechika

browser-versions.json

@@ -1,4 +1,4 @@
 {
-  "chrome:beta": "94.0.4606.54",
-  "chrome:stable": "94.0.4606.54"
+  "chrome:beta": "95.0.4638.32",
+  "chrome:stable": "94.0.4606.61"
 }

cli/types/cypress.d.ts

@@ -2992,6 +2992,7 @@ declare namespace Cypress {
     disableTimersAndAnimations: boolean
     padding: Padding
     scale: boolean
+    overwrite: boolean
     onBeforeScreenshot: ($el: JQuery) => void
     onAfterScreenshot: ($el: JQuery, props: {
       path: string

packages/driver/cypress/integration/commands/net_stubbing_spec.ts

@@ -11,8 +11,7 @@ const testFail = (cb, expectedDocsUrl = 'https://on.cypress.io/intercept') => {
   })
 }
 
-// TODO: Network retries leak between tests, causing flake.
-describe('network stubbing', { retries: 2 }, function () {
+describe('network stubbing', function () {
   const { $, _, sinon, state, Promise } = Cypress
 
   beforeEach(function () {

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

@@ -27,6 +27,7 @@ describe('src/cy/commands/screenshot', () => {
       capture: 'viewport',
       screenshotOnRunFailure: true,
       disableTimersAndAnimations: true,
+      overwrite: false,
       scale: true,
       blackout: ['.foo'],
     }
@@ -135,6 +136,7 @@ describe('src/cy/commands/screenshot', () => {
           isOpen: true,
           appOnly: false,
           scale: true,
+          overwrite: false,
           waitForCommandSynchronization: true,
           disableTimersAndAnimations: true,
           blackout: [],
@@ -146,6 +148,7 @@ describe('src/cy/commands/screenshot', () => {
           isOpen: false,
           appOnly: false,
           scale: true,
+          overwrite: false,
           waitForCommandSynchronization: true,
           disableTimersAndAnimations: true,
           blackout: [],
@@ -276,7 +279,7 @@ describe('src/cy/commands/screenshot', () => {
       })
     })
 
-    it('takes screenshot of hook title with test', () => {})
+    it('takes screenshot of hook title with test', () => { })
   })
 
   context('#screenshot', () => {
@@ -411,6 +414,7 @@ describe('src/cy/commands/screenshot', () => {
             isOpen: true,
             appOnly: true,
             scale: true,
+            overwrite: false,
             waitForCommandSynchronization: false,
             disableTimersAndAnimations: true,
             blackout: ['.foo'],
@@ -431,6 +435,7 @@ describe('src/cy/commands/screenshot', () => {
             isOpen: false,
             appOnly: true,
             scale: true,
+            overwrite: false,
             waitForCommandSynchronization: false,
             disableTimersAndAnimations: true,
             blackout: ['.foo'],
@@ -453,6 +458,7 @@ describe('src/cy/commands/screenshot', () => {
             isOpen: true,
             appOnly: false,
             scale: true,
+            overwrite: false,
             waitForCommandSynchronization: true,
             disableTimersAndAnimations: true,
             blackout: [],
@@ -474,6 +480,7 @@ describe('src/cy/commands/screenshot', () => {
             isOpen: true,
             appOnly: true,
             scale: true,
+            overwrite: false,
             waitForCommandSynchronization: false,
             disableTimersAndAnimations: true,
             blackout: ['.foo'],

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

@@ -2407,12 +2407,12 @@ describe('src/cy/commands/xhr', () => {
       it('logs response', () => {
         cy.then(function () {
           cy.wrap(this).its('lastLog').invoke('invoke', 'consoleProps').should((consoleProps) => {
-            expect(consoleProps['Response Body']).to.deep.eq({
+            expect(consoleProps['Response Body'].trim()).to.deep.eq(JSON.stringify({
               some: 'json',
               foo: {
                 bar: 'baz',
               },
-            })
+            }, null, 2))
           })
         })
       })

packages/driver/cypress/integration/cypress/proxy-logging-spec.ts

@@ -1,3 +1,5 @@
+import { expect } from 'chai'
+
 describe('Proxy Logging', () => {
   const { _ } = Cypress
 
@@ -43,12 +45,6 @@ describe('Proxy Logging', () => {
     }
   }
 
-  beforeEach(() => {
-    // block race conditions caused by log update debouncing
-    // @ts-ignore
-    Cypress.config('logAttrsDelay', 0)
-  })
-
   context('request logging', () => {
     it('fetch log shows resource type, url, method, and status code and has expected snapshots and consoleProps', (done) => {
       fetch('/some-url')
@@ -106,6 +102,43 @@ describe('Proxy Logging', () => {
       })
     })
 
+    // @see https://github.com/cypress-io/cypress/issues/17656
+    it('xhr log has response body/status code', (done) => {
+      cy.window()
+      .then((win) => {
+        cy.on('log:changed', (log) => {
+          try {
+            expect(log.snapshots.map((v) => v.name)).to.deep.eq(['request', 'response'])
+            expect(log.consoleProps['Response Headers']).to.include({
+              'x-powered-by': 'Express',
+            })
+
+            expect(log.consoleProps['Response Body']).to.include('Cannot GET /some-url')
+            expect(log.consoleProps['Response Status Code']).to.eq(404)
+
+            expect(log.renderProps).to.include({
+              indicator: 'bad',
+              message: 'GET 404 /some-url',
+            })
+
+            expect(Object.keys(log.consoleProps)).to.deep.eq(
+              ['Event', 'Resource Type', 'Method', 'URL', 'Request went to origin?', 'XHR', 'groups', 'Request Headers', 'Response Status Code', 'Response Headers', 'Response Body'],
+            )
+
+            done()
+          } catch (err) {
+            // eslint-disable-next-line no-console
+            console.log('assertion error, retrying', err)
+          }
+        })
+
+        const xhr = new win.XMLHttpRequest()
+
+        xhr.open('GET', '/some-url')
+        xhr.send()
+      })
+    })
+
     it('does not log an unintercepted non-xhr/fetch request', (done) => {
       const img = new Image()
       const logs: any[] = []

packages/driver/cypress/integration/e2e/uncaught_errors_spec.js

@@ -175,6 +175,23 @@ describe('uncaught errors', () => {
     }).get('button:first').click()
   })
 
+  it('does not fail if thrown custom error with readonly name', (done) => {
+    cy.once('fail', (err) => {
+      expect(err.name).to.include('CustomError')
+      expect(err.message).to.include('custom error')
+
+      done()
+    })
+
+    cy.then(() => {
+      throw new class CustomError extends Error {
+        get name () {
+          return 'CustomError'
+        }
+      }('custom error')
+    })
+  })
+
   it('fails test based on an uncaught error after last command and before completing', (done) => {
     cy.on('fail', () => {
       done()

packages/driver/src/cy/commands/screenshot.ts

@@ -284,6 +284,7 @@ const takeScreenshot = (Cypress, state, screenshotConfig, options = {}) => {
     capture,
     padding,
     clip,
+    overwrite,
     disableTimersAndAnimations,
     onBeforeScreenshot,
     onAfterScreenshot,
@@ -313,6 +314,7 @@ const takeScreenshot = (Cypress, state, screenshotConfig, options = {}) => {
       waitForCommandSynchronization: !isAppOnly(screenshotConfig),
       disableTimersAndAnimations,
       blackout: getBlackout(screenshotConfig),
+      overwrite,
     }
   }
 
@@ -353,6 +355,7 @@ const takeScreenshot = (Cypress, state, screenshotConfig, options = {}) => {
     },
     scaled: getShouldScale(screenshotConfig),
     blackout: getBlackout(screenshotConfig),
+    overwrite,
     startTime: startTime.toISOString(),
   })
 
@@ -450,7 +453,7 @@ export default function (Commands, Cypress, cy, state, config) {
 
       const isWin = $dom.isWindow(subject)
 
-      let screenshotConfig = _.pick(options, 'capture', 'scale', 'disableTimersAndAnimations', 'blackout', 'waitForCommandSynchronization', 'padding', 'clip', 'onBeforeScreenshot', 'onAfterScreenshot')
+      let screenshotConfig = _.pick(options, 'capture', 'scale', 'disableTimersAndAnimations', 'overwrite', 'blackout', 'waitForCommandSynchronization', 'padding', 'clip', 'onBeforeScreenshot', 'onAfterScreenshot')
 
       screenshotConfig = $Screenshot.validate(screenshotConfig, 'screenshot', options._log)
       screenshotConfig = _.extend($Screenshot.getConfig(), screenshotConfig)

packages/driver/src/cypress/command_queue.ts

@@ -343,9 +343,10 @@ export default {
 
         // since this failed this means that a specific command failed
         // and we should highlight it in red or insert a new command
-        if (_.isObject(err)) {
+        // @ts-ignore
+        if (_.isObject(err) && !err.name) {
           // @ts-ignore
-          err.name = err.name || 'CypressError'
+          err.name = 'CypressError'
         }
 
         commandRunningFailed(Cypress, state, err)

packages/driver/src/cypress/error_messages.ts

@@ -1095,11 +1095,7 @@ export default {
       message: stripIndent`\
         ${cmd('request')} was invoked with \`{ failOnStatusCode: false, retryOnStatusCodeFailure: true }\`.
 
-        These options are incompatible with each other.
-
-        - To retry on non-2xx status codes, pass \`{ failOnStatusCode: true, retryOnStatusCodeFailure: true }\`.
-        - To not retry on non-2xx status codes, pass \`{ failOnStatusCode: true, retryOnStatusCodeFailure: true }\`.
-        - To fail on non-2xx status codes without retrying (the default behavior), pass \`{ failOnStatusCode: true, retryOnStatusCodeFailure: false }\``,
+        \`failOnStatusCode\` must be \`true\` if \`retryOnStatusCodeFailure\` is \`true\`.`,
       docsUrl: 'https://on.cypress.io/request',
     },
     auth_invalid: {