Merge branch 'feature-multidomain' into md-support-snapshots-and-console-props

Author: mjhenkes

packages/driver/cypress/integration/e2e/multi-domain/commands/multi_domain_unsupported_commands.spec.ts

@@ -6,7 +6,7 @@ context('cy.origin unsupported commands', () => {
 
   it('cy.route() method is deprecated', (done) => {
     cy.on('fail', (err) => {
-      expect(err.message).to.equal('`cy.route()` has been deprecated and use is not supported in the `cy.origin()` callback. Consider using `cy.intercept()` (outside of the callback) instead.')
+      expect(err.message).to.equal('`cy.route()` has been deprecated and its use is not supported in the `cy.origin()` callback. Consider using `cy.intercept()` (outside of the callback) instead.')
       expect(err.docsUrl).to.equal('https://on.cypress.io/intercept')
       done()
     })
@@ -18,7 +18,7 @@ context('cy.origin unsupported commands', () => {
 
   it('cy.server() method is deprecated', (done) => {
     cy.on('fail', (err) => {
-      expect(err.message).to.equal('`cy.server()` has been deprecated and use is not supported in the `cy.origin()` callback. Consider using `cy.intercept()` (outside of the callback) instead.')
+      expect(err.message).to.equal('`cy.server()` has been deprecated and its use is not supported in the `cy.origin()` callback. Consider using `cy.intercept()` (outside of the callback) instead.')
       expect(err.docsUrl).to.equal('https://on.cypress.io/intercept')
       done()
     })

packages/driver/cypress/integration/e2e/multi-domain/multi_domain_cypress_api.spec.ts

@@ -206,7 +206,7 @@ describe('cy.origin Cypress API', () => {
   context('not supported', () => {
     it('throws an error when a user attempts to configure Cypress.Server.defaults() inside of cy.origin', (done) => {
       cy.on('fail', (err) => {
-        expect(err.message).to.equal('`Cypress.Server.*` has been deprecated and use is not supported in the `cy.origin()` callback. Consider using `cy.intercept()` (outside of the callback) instead.')
+        expect(err.message).to.equal('`Cypress.Server.*` has been deprecated and its use is not supported in the `cy.origin()` callback. Consider using `cy.intercept()` (outside of the callback) instead.')
         expect(err.docsUrl).to.equal('https://on.cypress.io/intercept')
         done()
       })

packages/driver/src/cypress/error_messages.ts

@@ -1205,15 +1205,15 @@ export default {
     },
     unsupported: {
       route: {
-        message: `${cmd('route')} has been deprecated and use is not supported in the ${cmd('origin')} callback. Consider using ${cmd('intercept')} (outside of the callback) instead.`,
+        message: `${cmd('route')} has been deprecated and its use is not supported in the ${cmd('origin')} callback. Consider using ${cmd('intercept')} (outside of the callback) instead.`,
         docsUrl: 'https://on.cypress.io/intercept',
       },
       server: {
-        message: `${cmd('server')} has been deprecated and use is not supported in the ${cmd('origin')} callback. Consider using ${cmd('intercept')} (outside of the callback) instead.`,
+        message: `${cmd('server')} has been deprecated and its use is not supported in the ${cmd('origin')} callback. Consider using ${cmd('intercept')} (outside of the callback) instead.`,
         docsUrl: 'https://on.cypress.io/intercept',
       },
       Server: {
-        message: `\`Cypress.Server.*\` has been deprecated and use is not supported in the ${cmd('origin')} callback. Consider using ${cmd('intercept')} (outside of the callback) instead.`,
+        message: `\`Cypress.Server.*\` has been deprecated and its use is not supported in the ${cmd('origin')} callback. Consider using ${cmd('intercept')} (outside of the callback) instead.`,
         docsUrl: 'https://on.cypress.io/intercept',
       },
       Cookies_preserveOnce: {