Merge branch 'develop' into issue-7955-overwrite-existing-screenshots

Author: davidmunechika

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/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)