Skip to content

Commit 94e3fa8

Browse files
authored
Merge branch 'develop' into issue-30198
2 parents 1590f7f + 93f708c commit 94e3fa8

File tree

4 files changed

+24
-14
lines changed

4 files changed

+24
-14
lines changed

cli/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ _Released 5/20/2025 (PENDING)_
2222

2323
**Dependency Updates:**
2424

25-
- Upgraded `@sinonjs/fake-timers` from `8.1.0` to `9.1.2`. Addressed in [#31725](https://github.com/cypress-io/cypress/pull/31725).
25+
- Upgraded `@sinonjs/fake-timers` from `8.1.0` to `10.3.0`. Addressed in [#31725](https://github.com/cypress-io/cypress/pull/31725) and [#31737](https://github.com/cypress-io/cypress/pull/31737).
2626
- Upgraded `trash` from `5.2.0` to `7.2.0`. Addressed in [#31667](https://github.com/cypress-io/cypress/pull/31667).
2727
- Upgraded `webdriver` from `9.11.0` to `9.14.0`. Addressed in [#31689](https://github.com/cypress-io/cypress/pull/31689).
2828

packages/app/cypress/e2e/studio/studio-cloud.cy.ts

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -148,13 +148,16 @@ describe('Studio Cloud', () => {
148148
})
149149

150150
cy.mockStudioFullSnapshot({
151-
id: 1,
152-
nodeType: 1,
153-
nodeName: 'div',
154-
localName: 'div',
155-
nodeValue: 'div',
156-
children: [],
157-
shadowRoots: [],
151+
fullSnapshot: {
152+
id: 1,
153+
nodeType: 1,
154+
nodeName: 'div',
155+
localName: 'div',
156+
nodeValue: 'div',
157+
children: [],
158+
shadowRoots: [],
159+
},
160+
url: 'http://localhost:3000/cypress/e2e/index.html',
158161
})
159162

160163
const deferred = pDefer()

packages/driver/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"@packages/telemetry": "0.0.0-development",
3535
"@packages/ts": "0.0.0-development",
3636
"@packages/types": "0.0.0-development",
37-
"@sinonjs/fake-timers": "9.1.2",
37+
"@sinonjs/fake-timers": "10.3.0",
3838
"@types/chai": "5.0.1",
3939
"@types/chai-subset": "1.3.5",
4040
"@types/common-tags": "^1.8.0",

yarn.lock

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6716,12 +6716,12 @@
67166716
dependencies:
67176717
type-detect "4.0.8"
67186718

6719-
"@sinonjs/fake-timers@9.1.2", "@sinonjs/fake-timers@^9.1.2":
6720-
version "9.1.2"
6721-
resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-9.1.2.tgz#4eaab737fab77332ab132d396a3c0d364bd0ea8c"
6722-
integrity sha512-BPS4ynJW/o92PUR4wgriz2Ud5gpST5vz6GQfMixEDK0Z8ZCUv2M7SkBLykH56T++Xs+8ln9zTGbOvNGIe02/jw==
6719+
"@sinonjs/fake-timers@10.3.0":
6720+
version "10.3.0"
6721+
resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz#55fdff1ecab9f354019129daf4df0dd4d923ea66"
6722+
integrity sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==
67236723
dependencies:
6724-
"@sinonjs/commons" "^1.7.0"
6724+
"@sinonjs/commons" "^3.0.0"
67256725

67266726
"@sinonjs/fake-timers@^11.2.2":
67276727
version "11.2.2"
@@ -6737,6 +6737,13 @@
67376737
dependencies:
67386738
"@sinonjs/commons" "^1.7.0"
67396739

6740+
"@sinonjs/fake-timers@^9.1.2":
6741+
version "9.1.2"
6742+
resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-9.1.2.tgz#4eaab737fab77332ab132d396a3c0d364bd0ea8c"
6743+
integrity sha512-BPS4ynJW/o92PUR4wgriz2Ud5gpST5vz6GQfMixEDK0Z8ZCUv2M7SkBLykH56T++Xs+8ln9zTGbOvNGIe02/jw==
6744+
dependencies:
6745+
"@sinonjs/commons" "^1.7.0"
6746+
67406747
"@sinonjs/formatio@^2.0.0":
67416748
version "2.0.0"
67426749
resolved "https://registry.yarnpkg.com/@sinonjs/formatio/-/formatio-2.0.0.tgz#84db7e9eb5531df18a8c5e0bfb6e449e55e654b2"

0 commit comments

Comments
 (0)