From c66a23e91db9edb5a2cf79f01d550568a00c052c Mon Sep 17 00:00:00 2001
From: KHeo <sainthkh@naver.com>
Date: Wed, 30 Mar 2022 16:18:26 +0900
Subject: [PATCH 1/7] fix: `cy.type()` should work with Firefox 98+

---
 .../driver/src/cy/commands/actions/type.ts    | 32 ++++++++++++++++---
 packages/driver/src/cypress.ts                |  1 +
 packages/driver/src/cypress/browser.ts        |  1 +
 3 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/packages/driver/src/cy/commands/actions/type.ts b/packages/driver/src/cy/commands/actions/type.ts
index 08e8e413c8..1d81551ff0 100644
--- a/packages/driver/src/cy/commands/actions/type.ts
+++ b/packages/driver/src/cy/commands/actions/type.ts
@@ -334,9 +334,16 @@ export default function (Commands, Cypress, cy, state, config) {
           }
 
           if (
-            // Firefox sends a click event when the Space key is pressed.
-            // We don't want to send it twice.
-            !Cypress.isBrowser('firefox') &&
+            (
+              // Before Firefox 98,
+              // Firefox sends a click event when the Space key is pressed.
+              // We don't want to send it twice.
+              !Cypress.isBrowser('firefox') ||
+              // After Firefox 98,
+              // it sends a click event automatically if the element is a <button>
+              // it does not if the element is an <input>
+              (Cypress.isBrowser('firefox') && Cypress.browserMajorVersion() >= 98 && $elements.isInput(event.target))
+            ) &&
             // Click event is sent after keyup event with space key.
             event.type === 'keyup' && event.code === 'Space' &&
             // When event is prevented, the click event should not be emitted
@@ -352,6 +359,16 @@ export default function (Commands, Cypress, cy, state, config) {
             fireClickEvent(event.target)
 
             keydownEvents = []
+
+            // After Firefox 98,
+            // Firefox doesn't update checkbox automatically even if the click event is sent.
+            if (Cypress.isBrowser('firefox')) {
+              if (event.target.type === 'checkbox') {
+                event.target.checked = !event.target.checked
+              } else if (event.target.type === 'radio') { // when checked is false, here cannot be reached because of the above condition
+                event.target.checked = true
+              }
+            }
           }
         },
 
@@ -404,8 +421,13 @@ export default function (Commands, Cypress, cy, state, config) {
           // https://github.com/cypress-io/cypress/issues/19541
           // Send click event on type('{enter}')
           if (sendClickEvent) {
-            // Firefox sends a click event automatically.
-            if (!Cypress.isBrowser('firefox')) {
+            if (
+              // Before Firefox 98, it sends a click event automatically.
+              !Cypress.isBrowser('firefox') ||
+              // After Firefox 98,
+              // it sends a click event automatically if the element is a <button>
+              // it does not if the element is an <input>
+              (Cypress.isBrowser('firefox') && Cypress.browserMajorVersion() >= 98 && $elements.isInput(el))) {
               fireClickEvent(el)
             }
           }
diff --git a/packages/driver/src/cypress.ts b/packages/driver/src/cypress.ts
index 196f73a1a9..19b3f05fa9 100644
--- a/packages/driver/src/cypress.ts
+++ b/packages/driver/src/cypress.ts
@@ -100,6 +100,7 @@ class $Cypress {
   isCy: any
   log: any
   isBrowser: any
+  browserMajorVersion: any
   emit: any
   emitThen: any
   emitMap: any
diff --git a/packages/driver/src/cypress/browser.ts b/packages/driver/src/cypress/browser.ts
index 28352d4a4e..559d748434 100644
--- a/packages/driver/src/cypress/browser.ts
+++ b/packages/driver/src/cypress/browser.ts
@@ -69,5 +69,6 @@ export default (config) => {
   return {
     browser: config.browser,
     isBrowser: _.partial(isBrowser, config),
+    browserMajorVersion: () => config.browser.majorVersion,
   }
 }

From 94fa50de01d0006626a3f212f0c02379f39aeebb Mon Sep 17 00:00:00 2001
From: KHeo <sainthkh@naver.com>
Date: Thu, 31 Mar 2022 15:03:48 +0900
Subject: [PATCH 2/7] feedback

---
 packages/driver/src/cy/commands/actions/type.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/driver/src/cy/commands/actions/type.ts b/packages/driver/src/cy/commands/actions/type.ts
index 1d81551ff0..a00836000e 100644
--- a/packages/driver/src/cy/commands/actions/type.ts
+++ b/packages/driver/src/cy/commands/actions/type.ts
@@ -274,6 +274,7 @@ export default function (Commands, Cypress, cy, state, config) {
 
       const isContentEditable = $elements.isContentEditable(options.$el.get(0))
       const isTextarea = $elements.isTextarea(options.$el.get(0))
+      const isFirefoxBefore98 = Cypress.isBrowser('firefox') && Cypress.browserMajorVersion() < 98
 
       const fireClickEvent = (el) => {
         const ctor = $dom.getDocumentFromElement(el).defaultView!.PointerEvent
@@ -342,7 +343,7 @@ export default function (Commands, Cypress, cy, state, config) {
               // After Firefox 98,
               // it sends a click event automatically if the element is a <button>
               // it does not if the element is an <input>
-              (Cypress.isBrowser('firefox') && Cypress.browserMajorVersion() >= 98 && $elements.isInput(event.target))
+              (!isFirefoxBefore98 && $elements.isInput(event.target))
             ) &&
             // Click event is sent after keyup event with space key.
             event.type === 'keyup' && event.code === 'Space' &&
@@ -427,7 +428,7 @@ export default function (Commands, Cypress, cy, state, config) {
               // After Firefox 98,
               // it sends a click event automatically if the element is a <button>
               // it does not if the element is an <input>
-              (Cypress.isBrowser('firefox') && Cypress.browserMajorVersion() >= 98 && $elements.isInput(el))) {
+              (!isFirefoxBefore98 && $elements.isInput(el))) {
               fireClickEvent(el)
             }
           }

From 0df0d7a28f8e3a342626f1f4c9041385386d9a36 Mon Sep 17 00:00:00 2001
From: Jon Koops <jonkoops@gmail.com>
Date: Fri, 1 Apr 2022 03:08:22 +0200
Subject: [PATCH 3/7] fix(types): add correct type for preserve cookie callback
 (#20513)

Co-authored-by: Lachlan Miller <lachlan.miller.1990@outlook.com>
---
 cli/types/cypress.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cli/types/cypress.d.ts b/cli/types/cypress.d.ts
index 3e2244320e..85fd923882 100644
--- a/cli/types/cypress.d.ts
+++ b/cli/types/cypress.d.ts
@@ -2341,7 +2341,7 @@ declare namespace Cypress {
   type Agent<T extends sinon.SinonSpy> = SinonSpyAgent<T> & T
 
   interface CookieDefaults {
-    preserve: string | string[] | RegExp | ((cookie: any) => boolean)
+    preserve: string | string[] | RegExp | ((cookie: Cookie) => boolean)
   }
 
   interface Failable {

From c0d638c56b57df81c78ff7b6ffa0266a592a171a Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 4 Apr 2022 06:33:59 +1000
Subject: [PATCH 4/7] chore: Update Chrome (beta) to 101.0.4951.15 (#20882)

Co-authored-by: cypress-bot[bot] <2f0651858c6e38e0+cypress-bot[bot]@users.noreply.github.com>
---
 browser-versions.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/browser-versions.json b/browser-versions.json
index 70c2f183b6..457fc932f2 100644
--- a/browser-versions.json
+++ b/browser-versions.json
@@ -1,4 +1,4 @@
 {
-  "chrome:beta": "100.0.4896.60",
+  "chrome:beta": "101.0.4951.15",
   "chrome:stable": "100.0.4896.60"
 }

From 2e48f85be21f9371d1d6e7c03e3b58440598659f Mon Sep 17 00:00:00 2001
From: David Munechika <david.munechika@gatech.edu>
Date: Mon, 4 Apr 2022 11:47:02 -0400
Subject: [PATCH 5/7] fix: --spec with glob incorrectly splits filename
 (#20848)

Co-authored-by: Emily Rohrbough <emilyrohrbough@users.noreply.github.com>
---
 packages/server/lib/util/args.js            |  3 ++-
 packages/server/test/unit/util/args_spec.js | 30 +++++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/packages/server/lib/util/args.js b/packages/server/lib/util/args.js
index bc53d12f72..4c5dafd7d1 100644
--- a/packages/server/lib/util/args.js
+++ b/packages/server/lib/util/args.js
@@ -269,6 +269,7 @@ const parseSpecArgv = (pattern) => {
 
     if (token === ',') {
       const isBreakable =
+          (!opens.length && !closes.length) ||
           index > opens[opens.length - 1] &&
           index > closes[closes.length - 1] &&
           opens.length === closes.length
@@ -304,7 +305,7 @@ const parseSpecArgv = (pattern) => {
       rule.comma - offset,
     )
 
-    offset = offsettedBy
+    offset += offsettedBy
     carry = mutated
 
     return res
diff --git a/packages/server/test/unit/util/args_spec.js b/packages/server/test/unit/util/args_spec.js
index 64dc9370f0..53214afe5b 100644
--- a/packages/server/test/unit/util/args_spec.js
+++ b/packages/server/test/unit/util/args_spec.js
@@ -189,6 +189,36 @@ describe('lib/util/args', () => {
 
       expect(options.spec[0]).to.eq(`${cwd}/cypress/integration/{a,b,c}/*.js`)
     })
+
+    // https://github.com/cypress-io/cypress/issues/20794
+    it('does not split at filename with glob pattern', function () {
+      const options = this.setup('--spec', 'cypress/integration/foo/bar/[baz]/test.ts,cypress/integration/foo1/bar/[baz]/test.ts,cypress/integration/foo2/bar/baz/test.ts,cypress/integration/foo3/bar/baz/foo4.ts')
+
+      expect(options.spec[0]).to.eq(`${cwd}/cypress/integration/foo/bar/[baz]/test.ts`)
+      expect(options.spec[1]).to.eq(`${cwd}/cypress/integration/foo1/bar/[baz]/test.ts`)
+      expect(options.spec[2]).to.eq(`${cwd}/cypress/integration/foo2/bar/baz/test.ts`)
+      expect(options.spec[3]).to.eq(`${cwd}/cypress/integration/foo3/bar/baz/foo4.ts`)
+    })
+
+    // https://github.com/cypress-io/cypress/issues/20794
+    it('correctly splits at comma with glob pattern', function () {
+      const options = this.setup('--spec', 'cypress/integration/foo/bar/baz/test.ts,cypress/integration/foo1/bar/[baz]/test.ts,cypress/integration/foo2/bar/baz/test.ts,cypress/integration/foo3/bar/baz/foo4.ts')
+
+      expect(options.spec[0]).to.eq(`${cwd}/cypress/integration/foo/bar/baz/test.ts`)
+      expect(options.spec[1]).to.eq(`${cwd}/cypress/integration/foo1/bar/[baz]/test.ts`)
+      expect(options.spec[2]).to.eq(`${cwd}/cypress/integration/foo2/bar/baz/test.ts`)
+      expect(options.spec[3]).to.eq(`${cwd}/cypress/integration/foo3/bar/baz/foo4.ts`)
+    })
+
+    // https://github.com/cypress-io/cypress/issues/20794
+    it('correctly splits at comma with escaped glob pattern', function () {
+      const options = this.setup('--spec', 'cypress/integration/foo/bar/\[baz\]/test.ts,cypress/integration/foo1/bar/\[baz1\]/test.ts,cypress/integration/foo2/bar/baz/test.ts,cypress/integration/foo3/bar/baz/foo4.ts')
+
+      expect(options.spec[0]).to.eq(`${cwd}/cypress/integration/foo/bar/\[baz\]/test.ts`)
+      expect(options.spec[1]).to.eq(`${cwd}/cypress/integration/foo1/bar/\[baz1\]/test.ts`)
+      expect(options.spec[2]).to.eq(`${cwd}/cypress/integration/foo2/bar/baz/test.ts`)
+      expect(options.spec[3]).to.eq(`${cwd}/cypress/integration/foo3/bar/baz/foo4.ts`)
+    })
   })
 
   context('--tag', () => {

From 0cce18ad359b99a740399ce5c0fac200175d186f Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 5 Apr 2022 10:04:55 -0500
Subject: [PATCH 6/7] chore: Update Chrome (stable) to 100.0.4896.75 (#20909)

Co-authored-by: cypress-bot[bot] <2f0651858c6e38e0+cypress-bot[bot]@users.noreply.github.com>
---
 browser-versions.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/browser-versions.json b/browser-versions.json
index 457fc932f2..f409e32c00 100644
--- a/browser-versions.json
+++ b/browser-versions.json
@@ -1,4 +1,4 @@
 {
   "chrome:beta": "101.0.4951.15",
-  "chrome:stable": "100.0.4896.60"
+  "chrome:stable": "100.0.4896.75"
 }

From edf9c11a30e05b03a2fa6cfe47f7553de39cd86c Mon Sep 17 00:00:00 2001
From: Chris Breiding <chrisbreiding@users.noreply.github.com>
Date: Tue, 5 Apr 2022 12:07:56 -0400
Subject: [PATCH 7/7] fix: Resend *.enable commands on CDP reconnect (#20916)

Co-authored-by: Zach Bloomquist <git@chary.us>
Co-authored-by: Matt Henkes <mjhenkes@gmail.com>
---
 packages/server/lib/browsers/cri-client.ts    | 35 +++++++++++++++-
 .../test/unit/browsers/cri-client_spec.ts     | 40 ++++++++++++++++---
 2 files changed, 68 insertions(+), 7 deletions(-)

diff --git a/packages/server/lib/browsers/cri-client.ts b/packages/server/lib/browsers/cri-client.ts
index 3642038844..5ebbad6bcb 100644
--- a/packages/server/lib/browsers/cri-client.ts
+++ b/packages/server/lib/browsers/cri-client.ts
@@ -23,6 +23,9 @@ type websocketUrl = string
  */
 namespace CRI {
   export type Command =
+    'Page.enable' |
+    'Network.enable' |
+    'Console.enable' |
     'Browser.getVersion' |
     'Page.bringToFront' |
     'Page.captureScreenshot' |
@@ -138,6 +141,7 @@ type DeferredPromise = { resolve: Function, reject: Function }
 
 export const create = async (target: websocketUrl, onAsynchronousError: Function): Promise<CRIWrapper> => {
   const subscriptions: {eventName: CRI.EventName, cb: Function}[] = []
+  const enableCommands: CRI.Command[] = []
   let enqueuedCommands: {command: CRI.Command, params: any, p: DeferredPromise }[] = []
 
   let closed = false // has the user called .close on this?
@@ -158,7 +162,14 @@ export const create = async (target: websocketUrl, onAsynchronousError: Function
     try {
       await connect()
 
-      debug('restoring subscriptions + running queued commands... %o', { subscriptions, enqueuedCommands })
+      debug('restoring subscriptions + running *.enable and queued commands... %o', { subscriptions, enableCommands, enqueuedCommands })
+
+      // '*.enable' commands need to be resent on reconnect or any events in
+      // that namespace will no longer be received
+      await Promise.all(enableCommands.map((cmdName) => {
+        return cri.send(cmdName)
+      }))
+
       subscriptions.forEach((sub) => {
         cri.on(sub.eventName, sub.cb)
       })
@@ -175,13 +186,20 @@ export const create = async (target: websocketUrl, onAsynchronousError: Function
   }
 
   const connect = async () => {
-    cri?.close()
+    await cri?.close()
 
     debug('connecting %o', { target })
 
     cri = await chromeRemoteInterface({
       target,
       local: true,
+      // Minor optimization. chrome-remote-interface creates a DSL based on
+      // this so you can call methods instead of using the event emitter
+      // (e.g. cri.Network.enable() instead of cri.send('Network.enable'))
+      // We only use the event emitter, so if we pass in an empty protcol,
+      // it will keep c-r-i from looping through it and needlessly creating
+      // the DSL
+      protocol: { domains: [] },
     })
 
     connected = true
@@ -226,10 +244,20 @@ export const create = async (target: websocketUrl, onAsynchronousError: Function
         })
       }
 
+      // Keep track of '*.enable' commands so they can be resent when
+      // reconnecting
+      if (command.endsWith('.enable')) {
+        enableCommands.push(command)
+      }
+
       if (connected) {
         try {
           return await cri.send(command, params)
         } catch (err) {
+          // This error occurs when the browser has been left open for a long
+          // time and/or the user's computer has been put to sleep. The
+          // socket disconnects and we need to recreate the socket and
+          // connection
           if (!WEBSOCKET_NOT_OPEN_RE.test(err.message)) {
             throw err
           }
@@ -257,6 +285,9 @@ export const create = async (target: websocketUrl, onAsynchronousError: Function
 
       return cri.close()
     },
+
+    // @ts-ignore
+    reconnect,
   }
 
   return client
diff --git a/packages/server/test/unit/browsers/cri-client_spec.ts b/packages/server/test/unit/browsers/cri-client_spec.ts
index a610e91f3b..597fa1463a 100644
--- a/packages/server/test/unit/browsers/cri-client_spec.ts
+++ b/packages/server/test/unit/browsers/cri-client_spec.ts
@@ -12,23 +12,29 @@ describe('lib/browsers/cri-client', function () {
   }
   let send: sinon.SinonStub
   let criImport: sinon.SinonStub
+  let criStub: {
+    send: typeof send
+    close: sinon.SinonStub
+    _notifier: EventEmitter
+  }
   let onError: sinon.SinonStub
   let getClient: () => ReturnType<typeof create>
 
   beforeEach(function () {
     send = sinon.stub()
     onError = sinon.stub()
+    criStub = {
+      send,
+      close: sinon.stub(),
+      _notifier: new EventEmitter(),
+    }
 
     criImport = sinon.stub()
     .withArgs({
       target: DEBUGGER_URL,
       local: true,
     })
-    .resolves({
-      send,
-      close: sinon.stub(),
-      _notifier: new EventEmitter(),
-    })
+    .resolves(criStub)
 
     criClient = proxyquire('../lib/browsers/cri-client', {
       'chrome-remote-interface': criImport,
@@ -120,4 +126,28 @@ describe('lib/browsers/cri-client', function () {
       })
     })
   })
+
+  describe('on reconnect', () => {
+    it('resends *.enable commands', async () => {
+      criStub._notifier.on = sinon.stub()
+
+      const client = await getClient()
+
+      client.send('Page.enable')
+      client.send('Page.foo')
+      client.send('Page.bar')
+      client.send('Network.enable')
+      client.send('Network.baz')
+
+      // clear out previous calls before reconnect
+      criStub.send.reset()
+
+      // @ts-ignore
+      await criStub._notifier.on.withArgs('disconnect').args[0][1]()
+
+      expect(criStub.send).to.be.calledTwice
+      expect(criStub.send).to.be.calledWith('Page.enable')
+      expect(criStub.send).to.be.calledWith('Network.enable')
+    })
+  })
 })