diff --git a/cli/CHANGELOG.md b/cli/CHANGELOG.md index d6ec56cf26..e75bd10f56 100644 --- a/cli/CHANGELOG.md +++ b/cli/CHANGELOG.md @@ -15,7 +15,7 @@ _Released 4/8/2025 (PENDING)_ **Dependency Updates:** -- Upgraded `mocha` from `7.0.1` to `7.1.0`. Addressed in [#31387](https://github.com/cypress-io/cypress/pull/31387). +- Upgraded `mocha` from `7.0.1` to `7.1.1`. Addressed in [#31401](https://github.com/cypress-io/cypress/pull/31401). - Upgraded `webdriver` from `9.7.3` to `9.11.0`. Addressed in [#31315](https://github.com/cypress-io/cypress/pull/31315). - Upgraded `win-version-info` from `5.0.1` to `6.0.1`. Addressed in [#31358](https://github.com/cypress-io/cypress/pull/31358). diff --git a/packages/driver/package.json b/packages/driver/package.json index 64078b80cf..c9ed18a2ae 100644 --- a/packages/driver/package.json +++ b/packages/driver/package.json @@ -77,7 +77,7 @@ "methods": "1.1.2", "mime": "^3.0.0", "minimatch": "3.1.2", - "mocha": "7.1.0", + "mocha": "7.1.1", "multer": "1.4.4", "ordinal": "1.0.3", "react-15.6.1": "npm:react@15.6.1", diff --git a/packages/driver/patches/mocha+7.1.0.dev.patch b/packages/driver/patches/mocha+7.1.1.dev.patch similarity index 98% rename from packages/driver/patches/mocha+7.1.0.dev.patch rename to packages/driver/patches/mocha+7.1.1.dev.patch index 8e5f9fa11f..64d39a6947 100644 --- a/packages/driver/patches/mocha+7.1.0.dev.patch +++ b/packages/driver/patches/mocha+7.1.1.dev.patch @@ -1,9 +1,23 @@ diff --git a/node_modules/mocha/CHANGELOG.md b/node_modules/mocha/CHANGELOG.md deleted file mode 100644 -index 4cf0b4e..0000000 +index 8c2f86a..0000000 --- a/node_modules/mocha/CHANGELOG.md +++ /dev/null -@@ -1,609 +0,0 @@ +@@ -1,623 +0,0 @@ +-# 7.1.1 / 2020-03-18 +- +-## :lock: Security Fixes +- +-- [#4204](https://github.com/mochajs/mocha/issues/4204): Update dependencies mkdirp, yargs-parser and yargs ([**@juergba**](https://github.com/juergba)) +- +-## :bug: Fixes +- +-- [#3660](https://github.com/mochajs/mocha/issues/3660): Fix `runner` listening to `start` and `end` events ([**@juergba**](https://github.com/juergba)) +- +-## :book: Documentation +- +-- [#4190](https://github.com/mochajs/mocha/issues/4190): Show Netlify badge on footer ([**@outsideris**](https://github.com/outsideris)) +- -# 7.1.0 / 2020-02-26 - -## :tada: Enhancements @@ -746,7 +760,7 @@ index 740e1fd..0cd2769 100644 runner.fullStackTrace = options.fullTrace; runner.asyncOnly = options.asyncOnly; diff --git a/node_modules/mocha/lib/runner.js b/node_modules/mocha/lib/runner.js -index 17fa290..52f437e 100644 +index 8e7c873..5208e60 100644 --- a/node_modules/mocha/lib/runner.js +++ b/node_modules/mocha/lib/runner.js @@ -682,9 +682,43 @@ Runner.prototype.runTests = function(suite, fn) { diff --git a/system-tests/lib/resultsUtils.ts b/system-tests/lib/resultsUtils.ts index ed642f197e..1849433354 100644 --- a/system-tests/lib/resultsUtils.ts +++ b/system-tests/lib/resultsUtils.ts @@ -4,8 +4,8 @@ import _ from 'lodash' const STATIC_DATE = '2018-02-01T20:14:19.323Z' -const expectDurationWithin = function (obj, duration, low, high, reset) { - const d = _.get(obj, duration) +const expectDurationWithin = function (obj: object, duration: string, low: number, high: number, reset: number) { + const d: number | undefined = _.get(obj, duration) // bail if we don't have a duration if (!_.isNumber(d)) { @@ -255,7 +255,7 @@ export const expectCorrectModuleApiResult = (json, opts: { expectDurationWithin( run, 'reporterStats.duration', - wallClocks, + wallClocks - 100, wallClocks + 1000, // add 600ms to account for padding 1234, ) diff --git a/yarn.lock b/yarn.lock index a75c7e527f..032259d51a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -22793,6 +22793,13 @@ mkdirp@0.5.1: dependencies: minimist "0.0.8" +mkdirp@0.5.3: + version "0.5.3" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.3.tgz#5a514b7179259287952881e94410ec5465659f8c" + integrity sha512-P+2gwrFqx8lhew375MQHHeTlY8AuOJSrGf0R5ddkEndUkmwpgUob/vQuBD1V22/Cw1/lJr4x+EjllSezBThzBg== + dependencies: + minimist "^1.2.5" + mkdirp@0.5.5: version "0.5.5" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" @@ -23023,6 +23030,36 @@ mocha@7.1.0: yargs-parser "13.1.1" yargs-unparser "1.6.0" +mocha@7.1.1: + version "7.1.1" + resolved "https://registry.yarnpkg.com/mocha/-/mocha-7.1.1.tgz#89fbb30d09429845b1bb893a830bf5771049a441" + integrity sha512-3qQsu3ijNS3GkWcccT5Zw0hf/rWvu1fTN9sPvEd81hlwsr30GX2GcDSSoBxo24IR8FelmrAydGC6/1J5QQP4WA== + 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 "3.0.0" + minimatch "3.0.4" + mkdirp "0.5.3" + 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.2" + yargs-parser "13.1.2" + yargs-unparser "1.6.0" + mocha@7.1.2: version "7.1.2" resolved "https://registry.yarnpkg.com/mocha/-/mocha-7.1.2.tgz#8e40d198acf91a52ace122cd7599c9ab857b29e6"