Merge pull request #18466 from cypress-io/merge-develop-2020-10-13

chore: merge in develop to unified-desktop-gui

Author: lmiller1990

browser-versions.json

@@ -1,4 +1,4 @@
 {
   "chrome:beta": "95.0.4638.40",
-  "chrome:stable": "94.0.4606.71"
+  "chrome:stable": "94.0.4606.81"
 }

npm/react/CHANGELOG.md

@@ -1,3 +1,11 @@
+# [@cypress/react-v5.10.1](https://github.com/cypress-io/cypress/compare/@cypress/react-v5.10.0...@cypress/react-v5.10.1) (2021-10-04)
+
+
+### Bug Fixes
+
+* configure proper pages directory for next application ([#18009](https://github.com/cypress-io/cypress/issues/18009)) ([70c7c36](https://github.com/cypress-io/cypress/commit/70c7c3678180d5408c144fa37f94ba5f5f8ceeb8))
+* next trace error ([#18189](https://github.com/cypress-io/cypress/issues/18189)) ([db6f909](https://github.com/cypress-io/cypress/commit/db6f9096bd6668db1937d0e38d3928866f6cd5df))
+
 # [@cypress/react-v5.10.0](https://github.com/cypress-io/cypress/compare/@cypress/react-v5.9.4...@cypress/react-v5.10.0) (2021-09-10)
 
 

npm/vite-dev-server/CHANGELOG.md

@@ -1,3 +1,12 @@
+# [@cypress/vite-dev-server-v2.1.1](https://github.com/cypress-io/cypress/compare/@cypress/vite-dev-server-v2.1.0...@cypress/vite-dev-server-v2.1.1) (2021-10-04)
+
+
+### Bug Fixes
+
+* **vite-dev-server:** remove base and root from inlineVitConfig types ([#17180](https://github.com/cypress-io/cypress/issues/17180)) ([07e7d0e](https://github.com/cypress-io/cypress/commit/07e7d0ed252bf1a2bd3224f617e1fc2e64f19a06))
+* **vite-dev-server:** replace UserConfig with InlineConfig to allow correct `configFile` types ([#18167](https://github.com/cypress-io/cypress/issues/18167)) ([6e0c2c1](https://github.com/cypress-io/cypress/commit/6e0c2c1af81be750a74bad0528d52de45746a453))
+* **vite-dev-server:** windows `supportFile` + preserve optimize entries ([#18286](https://github.com/cypress-io/cypress/issues/18286)) ([ea2f6a4](https://github.com/cypress-io/cypress/commit/ea2f6a45c7057e51b2fc879ff70da75538fa1002))
+
 # [@cypress/vite-dev-server-v2.1.0](https://github.com/cypress-io/cypress/compare/@cypress/vite-dev-server-v2.0.8...@cypress/vite-dev-server-v2.1.0) (2021-09-10)
 
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cypress",
-  "version": "8.5.0",
+  "version": "8.6.0",
   "description": "Cypress.io end to end testing tool",
   "private": true,
   "scripts": {

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

@@ -98,5 +98,32 @@ describe('src/cy/commands/debugging', () => {
         expect(cy.state('onPaused')).to.be.null
       })
     })
+
+    it('can pause in run mode with --headed and --no-exit', function () {
+      let didPause = false
+
+      Cypress.config('isInteractive', false)
+      Cypress.config('browser').isHeaded = true
+      Cypress.config('exit', false)
+
+      cy.once('paused', (name) => {
+        cy.once('paused', (name) => {
+          didPause = true
+
+          // resume the rest of the commands so this
+          // test ends
+          Cypress.emit('resume:all')
+        })
+
+        Cypress.emit('resume:next')
+      })
+
+      cy.pause().wrap({}).should('deep.eq', {}).then(function () {
+        expect(didPause).to.be.true
+
+        // should no longer have onPaused
+        expect(cy.state('onPaused')).to.be.null
+      })
+    })
   })
 })

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

@@ -47,8 +47,8 @@ export default (Commands, Cypress, cy, state, config) => {
     // pause should indefinitely pause until the user
     // presses a key or clicks in the UI to continue
     pause (subject, options = {}) {
-      // bail if we're headless
-      if (!config('isInteractive')) {
+      // bail if we're in run mode, unless --headed and --no-exit flags are passed
+      if (!config('isInteractive') && (!config('browser').isHeaded || config('exit'))) {
         return subject
       }
 

packages/runner-shared/src/logger.js

@@ -32,6 +32,9 @@ export const logger = {
       // _.trim([]) returns '' but we want to log empty arrays, so account for that
       if (_.isString(value) && _.trim(value) === '') return
 
+      // Skip trim if we know value is an object
+      if (typeof value !== 'object' && _.trim(value) === '' && !_.isArray(value)) return
+
       this.log(`%c${key}`, 'font-weight: bold', value)
     })
   },

packages/runner-shared/src/logger.spec.js

@@ -1,16 +1,43 @@
 const sinon = require('sinon')
 const { logger } = require('./logger')
+import _ from 'lodash'
 
 describe('logger', () => {
+  let spyLog = sinon.spy(logger, 'log')
+
+  afterEach(() => {
+    // reset after each unit test
+    spyLog.resetHistory()
+  })
+
   // https://github.com/cypress-io/cypress/issues/17542
   it('cy.log() shows all arguments in each line when there are multiple args', () => {
-    const spy = sinon.spy(logger, 'log')
-
     logger.logFormatted({ args: [1, 2, 3] })
 
-    expect(spy).to.have.been.calledWith(`%cArgs:`, 'font-weight: bold')
-    expect(spy).to.have.been.calledWith(`%c  [0]:`, 'font-weight: bold', 1)
-    expect(spy).to.have.been.calledWith(`%c  [1]:`, 'font-weight: bold', 2)
-    expect(spy).to.have.been.calledWith(`%c  [2]:`, 'font-weight: bold', 3)
+    expect(spyLog).to.have.been.calledWith(`%cArgs:`, 'font-weight: bold')
+    expect(spyLog).to.have.been.calledWith(`%c  [0]:`, 'font-weight: bold', 1)
+    expect(spyLog).to.have.been.calledWith(`%c  [1]:`, 'font-weight: bold', 2)
+    expect(spyLog).to.have.been.calledWith(`%c  [2]:`, 'font-weight: bold', 3)
+  })
+
+  describe('_logValues', () => {
+    let spyTrim = sinon.spy(_, 'trim')
+
+    afterEach(() => {
+      // reset after each unit test
+      spyTrim.resetHistory()
+    })
+
+    it('should not call trim', () => {
+      logger._logValues({})
+      logger._logValues({ test: {} })
+      logger._logValues(null)
+      logger._logValues(undefined)
+
+      expect(spyTrim.getCalls()).to.have.length(0)
+    })
+
+    // The positive unit tests to capture if log has been called are already written in
+    // the 'cy.log() shows all arguments in each line when there are multiple args' unit test.
   })
 })

packages/server/lib/controllers/runner.ts

@@ -22,7 +22,7 @@ const _serveNonProxiedError = (res: Response) => {
   })
 }
 
-export interface ServeOptions extends Pick<InitializeRoutes, 'getSpec' | 'config' | 'getCurrentBrowser' | 'getRemoteState' | 'specsStore'> {
+export interface ServeOptions extends Pick<InitializeRoutes, 'getSpec' | 'config' | 'getCurrentBrowser' | 'getRemoteState' | 'specsStore' | 'exit'> {
   testingType: Cypress.TestingType
 }
 
@@ -47,7 +47,7 @@ export const runner = {
       return _serveNonProxiedError(res)
     }
 
-    let { config, getRemoteState, getCurrentBrowser, getSpec, specsStore } = options
+    let { config, getRemoteState, getCurrentBrowser, getSpec, specsStore, exit } = options
 
     config = _.clone(config)
     // at any given point, rather than just arbitrarily modifying it.
@@ -72,6 +72,7 @@ export const runner = {
     config.spec = getSpec() ?? null
     config.specs = specsStore.specFiles
     config.browser = getCurrentBrowser()
+    config.exit = exit ?? true
 
     debug('serving runner index.html with config %o',
       _.pick(config, 'version', 'platform', 'arch', 'projectName'))

packages/server/lib/project-base.ts

@@ -45,6 +45,7 @@ type ReceivedCypressOptions =
 export interface Cfg extends ReceivedCypressOptions {
   projectRoot: string
   proxyServer?: Cypress.RuntimeConfigOptions['proxyUrl']
+  exit?: boolean
   state?: {
     firstOpened?: number
     lastOpened?: number
@@ -206,6 +207,7 @@ export class ProjectBase<TServer extends Server> extends EE {
     const [port, warning] = await this._server.open(cfg, {
       getCurrentBrowser: () => this.browser,
       getSpec: () => this.spec,
+      exit: this.options.args?.exit,
       onError: this.options.onError,
       onWarning: this.options.onWarning,
       shouldCorrelatePreRequests: this.shouldCorrelatePreRequests,