Merge branch 'develop' into release/14.0.0

browser-versions.json

@@ -1,5 +1,5 @@
 {
-  "chrome:beta": "131.0.6778.13",
+  "chrome:beta": "131.0.6778.24",
   "chrome:stable": "130.0.6723.91",
   "chrome:minimum": "64.0.3282.0"
 }

cli/lib/util.js

@@ -7,7 +7,7 @@ const la = require('lazy-ass')
 const is = require('check-more-types')
 const tty = require('tty')
 const path = require('path')
-const isCi = require('is-ci')
+const isCi = require('ci-info').isCI
 const execa = require('execa')
 const getos = require('getos')
 const chalk = require('chalk')

cli/package.json

@@ -31,6 +31,7 @@
     "cachedir": "^2.3.0",
     "chalk": "^4.1.0",
     "check-more-types": "^2.24.0",
+    "ci-info": "^4.0.0",
     "cli-cursor": "^3.1.0",
     "cli-table3": "~0.6.1",
     "commander": "^6.2.1",
@@ -45,7 +46,6 @@
     "figures": "^3.2.0",
     "fs-extra": "^9.1.0",
     "getos": "^3.2.1",
-    "is-ci": "^3.0.1",
     "is-installed-globally": "~0.4.0",
     "lazy-ass": "^1.6.0",
     "listr2": "^3.8.3",

packages/errors/package.json

@@ -30,8 +30,8 @@
     "@types/pngjs": "^6.0.1",
     "ansi-styles": "^5",
     "chai": "4.2.0",
+    "ci-info": "^4.0.0",
     "globby": "^11.1.0",
-    "is-ci": "^3.0.1",
     "mocha": "7.0.1",
     "pngjs": "^6.0.0",
     "rimraf": "5.0.10",

packages/errors/test/support/utils.ts

@@ -4,7 +4,7 @@ import fse from 'fs-extra'
 import path from 'path'
 import { PNG } from 'pngjs'
 
-const isCi = require('is-ci')
+const isCi = require('ci-info').isCI
 
 if (app) {
   app.on('window-all-closed', () => {

packages/errors/test/unit/visualSnapshotErrors_spec.ts

@@ -15,7 +15,7 @@ process.env.CYPRESS_INTERNAL_ENV = 'test'
 
 // require'd so the unsafe types from the server / missing types don't mix in here
 const termToHtml = require('term-to-html')
-const isCi = require('is-ci')
+const isCi = require('ci-info').isCI
 const { terminalBanner } = require('terminal-banner')
 const ciProvider = require('@packages/server/lib/util/ci_provider')
 const browsers = require('@packages/server/lib/browsers')

packages/server/lib/util/ci_provider.js

@@ -1,5 +1,5 @@
 const _ = require('lodash')
-const isCi = require('is-ci')
+const isCi = require('ci-info').isCI
 const debug = require('debug')('cypress:server')
 
 const getIsCi = () => isCi

packages/server/package.json

@@ -46,6 +46,7 @@
     "check-more-types": "2.24.0",
     "chokidar": "3.5.1",
     "chrome-remote-interface": "0.33.2",
+    "ci-info": "^4.0.0",
     "cli-table3": "0.5.1",
     "coffeescript": "2.6.0",
     "color-string": "1.5.5",
@@ -79,7 +80,6 @@
     "http-proxy": "1.18.1",
     "human-interval": "1.0.0",
     "image-size": "1.1.1",
-    "is-ci": "^3.0.1",
     "is-fork-pr": "2.5.0",
     "is-html": "2.0.0",
     "jimp": "0.22.12",

system-tests/lib/system-tests.ts

@@ -16,7 +16,7 @@ import {
   browserNameVersionRe,
 } from './normalizeStdout'
 
-const isCi = require('is-ci')
+const isCi = require('ci-info').isCI
 
 require('mocha-banner').register()
 const chalk = require('chalk').default
@@ -79,16 +79,6 @@ type ExecOptions = {
    * If set, test using the built Cypress CLI and binary. Expects a built CLI in `/cli/build` and packed binary in `/cypress.zip`.
    */
   withBinary?: boolean
-  /**
-   * Deprecated. Use `--cypress-inspect-brk` from command line instead.
-   * @deprecated
-   */
-  inspectBrk?: null
-  /**
-   * Deprecated. Use `--no-exit` from command line instead.
-   * @deprecated
-   */
-  exit?: null
   /**
    * Don't exit when tests are finished. You can also pass `--no-exit` via the command line.
    */
@@ -629,14 +619,6 @@ const systemTests = {
   },
 
   options (ctx, options: ExecOptions) {
-    if (options.inspectBrk != null) {
-      throw new Error(`
-      passing { inspectBrk: true } to system test options is no longer supported
-      Please pass the --cypress-inspect-brk flag to the test command instead
-      e.g. "yarn test async_timeouts_spec.js --cypress-inspect-brk"
-      `)
-    }
-
     _.defaults(options, {
       browser: process.env.SNAPSHOT_BROWSER || 'electron',
       headed: process.env.HEADED || false,
@@ -648,19 +630,10 @@ const systemTests = {
       sanitizeScreenshotDimensions: false,
       normalizeStdoutAvailableBrowsers: true,
       noExit: process.env.NO_EXIT,
-      inspectBrk: process.env.CYPRESS_INSPECT_BRK,
     })
 
     const projectPath = Fixtures.projectPath(options.project)
 
-    if (options.exit != null) {
-      throw new Error(`
-      passing { exit: false } to system test options is no longer supported
-      Please pass the --no-exit flag to the test command instead
-      e.g. "yarn test async_timeouts_spec.js --no-exit"
-      `)
-    }
-
     if (options.noExit && options.timeout < 3000000) {
       options.timeout = 3000000
     }
@@ -770,10 +743,6 @@ const systemTests = {
       args.push('--no-exit')
     }
 
-    if (options.inspectBrk) {
-      args.push('--inspect-brk')
-    }
-
     if (options.tag) {
       args.push(`--tag=${options.tag}`)
     }

yarn.lock

@@ -19059,7 +19059,7 @@ [email protected], is-ci@^2.0.0:
   dependencies:
     ci-info "^2.0.0"
 
-[email protected], is-ci@^3.0.0, is-ci@^3.0.1:
+[email protected], is-ci@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-3.0.1.tgz#db6ecbed1bd659c43dac0f45661e7674103d1867"
   integrity sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==
@@ -22192,7 +22192,7 @@ [email protected]:
   resolved "https://registry.yarnpkg.com/mobx/-/mobx-5.15.4.tgz#9da1a84e97ba624622f4e55a0bf3300fb931c2ab"
   integrity sha512-xRFJxSU2Im3nrGCdjSuOTFmxVDGeqOHL+TyADCGbT0k4HHqGmx5u2yaHNryvoORpI4DfbzjJ5jPmuv+d7sioFw==
 
-"mocha-7.0.1@npm:[email protected]", [email protected]:
+"mocha-7.0.1@npm:[email protected]":
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/mocha/-/mocha-7.0.1.tgz#276186d35a4852f6249808c6dd4a1376cbf6c6ce"
   integrity sha512-9eWmWTdHLXh72rGrdZjNbG3aa1/3NRPpul1z0D979QpEnFdCG0Q5tv834N+94QEN2cysfV72YocQ3fn87s70fg==
@@ -22309,6 +22309,36 @@ [email protected]:
     yargs-parser "13.1.1"
     yargs-unparser "1.6.0"
 
+[email protected]:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/mocha/-/mocha-7.0.1.tgz#276186d35a4852f6249808c6dd4a1376cbf6c6ce"
+  integrity sha512-9eWmWTdHLXh72rGrdZjNbG3aa1/3NRPpul1z0D979QpEnFdCG0Q5tv834N+94QEN2cysfV72YocQ3fn87s70fg==
+  dependencies:
+    ansi-colors "3.2.3"
+    browser-stdout "1.3.1"
+    chokidar "3.3.0"
+    debug "3.2.6"
+    diff "3.5.0"
+    escape-string-regexp "1.0.5"
+    find-up "3.0.0"
+    glob "7.1.3"
+    growl "1.10.5"
+    he "1.2.0"
+    js-yaml "3.13.1"
+    log-symbols "2.2.0"
+    minimatch "3.0.4"
+    mkdirp "0.5.1"
+    ms "2.1.1"
+    node-environment-flags "1.0.6"
+    object.assign "4.1.0"
+    strip-json-comments "2.0.1"
+    supports-color "6.0.0"
+    which "1.3.1"
+    wide-align "1.1.3"
+    yargs "13.3.0"
+    yargs-parser "13.1.1"
+    yargs-unparser "1.6.0"
+
 [email protected]:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/mocha/-/mocha-7.1.0.tgz#c784f579ad0904d29229ad6cb1e2514e4db7d249"
@@ -29015,7 +29045,7 @@ string-template@~0.2.1:
   resolved "https://registry.yarnpkg.com/string-template/-/string-template-0.2.1.tgz#42932e598a352d01fc22ec3367d9d84eec6c9add"
   integrity sha1-QpMuWYo1LQH8IuwzZ9nYTuxsmt0=
 
-"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+"string-width-cjs@npm:string-width@^4.2.0":
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -29041,6 +29071,15 @@ string-width@^1.0.1, string-width@^1.0.2:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^4.0.0"
 
+"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
+
 string-width@^3.0.0, string-width@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
@@ -29142,7 +29181,7 @@ stringify-object@^3.0.0, stringify-object@^3.3.0:
     is-obj "^1.0.1"
     is-regexp "^1.0.0"
 
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1", [email protected], strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -29163,6 +29202,13 @@ [email protected], strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
   dependencies:
     ansi-regex "^4.1.0"
 
+[email protected], strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
 strip-ansi@^3.0.0, strip-ansi@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
@@ -32092,7 +32138,7 @@ [email protected]:
   resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.2.0.tgz#827d93c9ba23ee2019c3ffaff5c27fccea289e8b"
   integrity sha512-Rsk5qQHJ9eowMH28Jwhe8HEbmdYDX4lwoMWshiCXugjtHqMD9ZbiqSDLxcsfdqsETPzVUtX5s1Z5kStiIM6l4A==
 
-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
@@ -32135,6 +32181,15 @@ wrap-ansi@^6.2.0:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
+wrap-ansi@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
 wrap-ansi@^8.0.1, wrap-ansi@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"