Merge branch 'develop' into cacie/perf/cri-client-memory-leak

cypress-io · Aug 15, 2024 · f056b90 · f056b90
2 parents 6b82a7c + dcd3799
commit f056b90
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 26 deletions.
diff --git a/cli/CHANGELOG.md b/cli/CHANGELOG.md
@@ -13,7 +13,7 @@ _Released 8/27/2024 (PENDING)_
 
 ## 13.13.3
 
-_Released 8/13/2024_
+_Released 8/14/2024_
 
 **Bugfixes:**
 

diff --git a/packages/driver/cypress/e2e/cy/timers.cy.js b/packages/driver/cypress/e2e/cy/timers.cy.js
@@ -1,7 +1,3 @@
-const startingIndex = Cypress.isBrowser('firefox') ? 1 : 0
-
-const timerNumber = (n) => n + startingIndex
-
 // NOTE: basically the same as a cy.wait(...) but uses setTimeout instead of Promise.delay
 // since firefox will sometimes have `Promise.delay(10)` fire faster than a `setTimeout(..., 1)`
 const cyWaitTimeout = (n) => cy.wrap(new Promise((resolve) => window.setTimeout(resolve, n)))
@@ -22,10 +18,6 @@ describe('driver/src/cy/timers', () => {
 
       const id1 = win.setTimeout(win.setBar, 1)
 
-      // the timer id is 1 by default since
-      // timers increment and always start at 0
-      expect(id1).to.eq(timerNumber(1))
-
       cy
       .window().its('bar').should('eq', 'bar')
       .log('setTimeout should not be called')
@@ -34,7 +26,7 @@ describe('driver/src/cy/timers', () => {
 
         const id2 = win.setTimeout(win.setBar, 2)
 
-        expect(id2).to.eq(timerNumber(2))
+        expect(id2).to.eq(id1 + 1)
 
         const ret = win.clearTimeout(id2)
 
@@ -73,10 +65,6 @@ describe('driver/src/cy/timers', () => {
 
       const id1 = win.setInterval(win.setBar, 1)
 
-      // the timer id is 1 by default since
-      // timers increment and always start at 0
-      expect(id1).to.eq(timerNumber(1))
-
       cy
       .window().its('bar').should('eq', 'bar')
       .log('setInterval should not be called')
@@ -87,7 +75,7 @@ describe('driver/src/cy/timers', () => {
 
         const id2 = win.setInterval(win.setBar, 2)
 
-        expect(id2).to.eq(timerNumber(2))
+        expect(id2).to.eq(id1 + 1)
 
         const ret = win.clearInterval(id2)
 
@@ -231,8 +219,6 @@ describe('driver/src/cy/timers', () => {
       .then(() => {
         const id1 = win.setTimeout(win.setBar, 1)
 
-        expect(id1).to.eq(timerNumber(1))
-
         cyWaitTimeout(1)
         .log('setTimeout should NOT have fired when paused')
         .window().its('bar').should('be.null')
@@ -252,7 +238,7 @@ describe('driver/src/cy/timers', () => {
         .then(() => {
           const id2 = win.setTimeout(win.setBar, 1)
 
-          expect(id2).to.eq(timerNumber(2))
+          expect(id2).to.eq(id1 + 1)
 
           const ret = win.clearTimeout(id2)
 
@@ -280,10 +266,6 @@ describe('driver/src/cy/timers', () => {
 
       const id1 = win.setTimeout(win.setBar, 10)
 
-      // the timer id is 1 by default since
-      // timers increment and always start at 0
-      expect(id1).to.eq(timerNumber(1))
-
       return cy.pauseTimers(true)
       .then(() => {
         cyWaitTimeout(10)
@@ -302,7 +284,7 @@ describe('driver/src/cy/timers', () => {
 
           const id2 = win.setInterval(win.setBar, 10)
 
-          expect(id2).to.eq(timerNumber(2))
+          expect(id2).to.eq(id1 + 1)
 
           return cy.pauseTimers(true)
           .then(() => {

diff --git a/tooling/v8-snapshot/cache/darwin/snapshot-meta.json b/tooling/v8-snapshot/cache/darwin/snapshot-meta.json
@@ -4333,5 +4333,5 @@
     "./tooling/v8-snapshot/cache/darwin/snapshot-entry.js"
   ],
   "deferredHashFile": "yarn.lock",
-  "deferredHash": "cd281068a7ed2d6e30c6a07a07fa1a2233cde51ab4b98f2e7ef1fda9925d6ac7"
+  "deferredHash": "4da96510e086543f19c5495cb276b653e29ae5953cb02ee4278872a4642647f5"
 }
diff --git a/tooling/v8-snapshot/cache/linux/snapshot-meta.json b/tooling/v8-snapshot/cache/linux/snapshot-meta.json
@@ -4336,5 +4336,5 @@
     "./tooling/v8-snapshot/cache/linux/snapshot-entry.js"
   ],
   "deferredHashFile": "yarn.lock",
-  "deferredHash": "cd281068a7ed2d6e30c6a07a07fa1a2233cde51ab4b98f2e7ef1fda9925d6ac7"
+  "deferredHash": "4da96510e086543f19c5495cb276b653e29ae5953cb02ee4278872a4642647f5"
 }
diff --git a/tooling/v8-snapshot/cache/win32/snapshot-meta.json b/tooling/v8-snapshot/cache/win32/snapshot-meta.json
@@ -4336,5 +4336,5 @@
     "./tooling/v8-snapshot/cache/win32/snapshot-entry.js"
   ],
   "deferredHashFile": "yarn.lock",
-  "deferredHash": "3bd7f0ed7ebf7e2bdbbd9bc47089d3e35d70b368fcdbafe9a11a77f86115b1fb"
+  "deferredHash": "e5df1f60c2b96c54f5e1da89b3b80e9bbde6bfd99a226bd007c3c07c919767bb"
 }