Merge branch 'develop' into issue-30198

Author: true2fik

cli/CHANGELOG.md

@@ -9,8 +9,9 @@ _Released 5/20/2025 (PENDING)_
 
 **Bugfixes:**
 
-- Fixed an issue with the experimental usage of WebKit where Cypress incorrectly displayed `0` as the WebKit version. Addresses [#31684](https://github.com/cypress-io/cypress/issues/31684).
 - Fixed an issue where framebusting was occurring when `top.window.location` was being set explicitly. This fix does not require the `experimentalModifyObstructiveThirdPartyCode` configuration option. Addresses [#31687](https://github.com/cypress-io/cypress/issues/31687).
+- `cy.press()` now has a return type of `Chainable<null>` instead of `void` to match the convention of other commands that yield `null`. Addressed in [#31698](https://github.com/cypress-io/cypress/pull/31698).
+- Fixed an issue with the experimental usage of WebKit where Cypress incorrectly displayed `0` as the WebKit version. Addresses [#31684](https://github.com/cypress-io/cypress/issues/31684).
 
 **Misc:**
 

cli/types/cypress.d.ts

@@ -1755,7 +1755,7 @@ declare namespace Cypress {
      *    cy.press(Cypress.Keyboard.Keys.TAB) // dispatches a keydown and press event to the browser, followed by a keyup event.
      * @see https://on.cypress.io/press
      */
-    press(key: typeof Cypress.Keyboard.Keys[keyof typeof Cypress.Keyboard.Keys], options?: Partial<Loggable & Timeoutable>): void
+    press(key: typeof Cypress.Keyboard.Keys[keyof typeof Cypress.Keyboard.Keys], options?: Partial<Loggable & Timeoutable>): Chainable<null>
 
     /**
      * Get the immediately preceding sibling of each element in a set of the elements.

npm/puppeteer/README.md

@@ -46,7 +46,7 @@ Before using `@cypress/puppeteer`, ensure the following requirements are met:
 
 - Cypress 13.6.0+ is required.
 - Only Chromium-based browsers are supported, such as Chrome for Testing, Chromium, and Electron.
-- Chrome-branded browsers (e.g., standard Chrome) are not supported in version 137+ due to Chrome's removal of the `--load-extension` flag. We recommend using Chrome for Testing or Chromium instead. [See download instructions](https://www.chromium.org/getting-involved/download-chromium/).
+- Chrome-branded browsers (e.g., standard Chrome) are not supported in version 137+ due to Chrome's removal of the `--load-extension` flag. We recommend using Chrome for Testing or Chromium instead. See Cypress Docker image examples for [Chrome for Testing](https://github.com/cypress-io/cypress-docker-images/tree/master/examples/chrome-for-testing) and [Chromium](https://github.com/cypress-io/cypress-docker-images/tree/master/examples/chromium).
 
 ## Usage
 

package.json

@@ -278,7 +278,7 @@
     "**/ua-parser-js": "0.7.33",
     "@types/react": "18.3.12",
     "browserify-sign": "4.2.2",
-    "devtools-protocol": "0.0.1413303",
+    "devtools-protocol": "0.0.1459876",
     "sharp": "0.29.3",
     "vue-template-compiler": "2.6.12"
   },

packages/driver/src/cy/commands/actions/press.ts

@@ -36,7 +36,7 @@ export default function (Commands: Cypress.Commands, Cypress: Cypress.Cypress, c
 
       // throwErrByPath always throws, but there's no way to indicate that
       // code beyond this point is unreachable to typescript / linters
-      return
+      return null
     }
 
     if (Cypress.browser.family === 'webkit') {
@@ -47,7 +47,7 @@ export default function (Commands: Cypress.Commands, Cypress: Cypress.Cypress, c
         },
       })
 
-      return
+      return null
     }
 
     if (Cypress.browser.name === 'firefox' && Number(Cypress.browser.majorVersion) < 135) {
@@ -71,7 +71,11 @@ export default function (Commands: Cypress.Commands, Cypress: Cypress.Cypress, c
     } catch (err) {
       $errUtils.throwErr(err, { onFail: log })
     }
+
+    return null
   }
 
-  return Commands.add('press', pressCommand)
+  return Commands.addAll({
+    press: pressCommand,
+  })
 }

packages/driver/test/unit/cy/commands/actions/press.spec.ts

@@ -51,9 +51,9 @@ describe('cy/commands/actions/press', () => {
       },
     }
 
-    // @ts-expect-error - this is a generic mock impl
     Commands = {
-      add: vi.fn(),
+      // @ts-expect-error - this is a generic mock impl
+      addAll: vi.fn(),
     }
 
     // @ts-expect-error
@@ -84,14 +84,14 @@ describe('cy/commands/actions/press', () => {
 
     addCommand(Commands, Cypress, cy, state, config)
 
-    expect(Commands.add).toHaveBeenCalledOnce()
+    expect(Commands.addAll).toHaveBeenCalledOnce()
 
     // @ts-expect-error
-    const [[cmdName, cmd]]: [[string, PressCommand]] = Commands.add.mock.calls
+    const [[obj]]: [[{press: PressCommand}]] = Commands.addAll.mock.calls
 
-    expect(cmdName).toEqual('press')
+    expect(typeof obj.press).toBe('function')
 
-    press = cmd as PressCommand
+    press = obj.press as PressCommand
   })
 
   describe('with a valid key', () => {

packages/proxy/package.json

@@ -44,7 +44,7 @@
     "@packages/types": "0.0.0-development",
     "@types/express": "4.17.2",
     "@types/supertest": "2.0.10",
-    "devtools-protocol": "0.0.1413303",
+    "devtools-protocol": "0.0.1459876",
     "express": "4.21.0",
     "supertest": "6.0.1",
     "typescript": "~5.4.5"

packages/server/package.json

@@ -181,7 +181,7 @@
     "chai-uuid": "1.0.6",
     "chrome-har-capturer": "0.13.4",
     "cross-env": "6.0.3",
-    "devtools-protocol": "0.0.1413303",
+    "devtools-protocol": "0.0.1459876",
     "eol": "0.9.1",
     "esbuild": "^0.15.3",
     "eventsource": "2.0.2",

packages/socket/package.json

@@ -32,7 +32,7 @@
     "@types/uuid": "8.3.2",
     "chai": "3.5.0",
     "cross-env": "6.0.3",
-    "devtools-protocol": "0.0.1413303",
+    "devtools-protocol": "0.0.1459876",
     "mocha": "3.5.3",
     "resolve-pkg": "2.0.0"
   },

packages/types/package.json

@@ -17,7 +17,7 @@
     "@types/node": "20.16.0",
     "axios": "^1.8.3",
     "better-sqlite3": "11.5.0",
-    "devtools-protocol": "0.0.1413303",
+    "devtools-protocol": "0.0.1459876",
     "express": "4.21.0",
     "socket.io": "4.0.1",
     "typescript": "~5.4.5"

system-tests/projects/cy-press-second-spec-error/cypress/e2e/first_spec.cy.js

@@ -1,5 +1,7 @@
 describe('this one should pass', () => {
   it('dispatches a key press', () => {
-    cy.press(Cypress.Keyboard.Keys.TAB)
+    cy.press(Cypress.Keyboard.Keys.TAB).then((val) => {
+      expect(val).to.be.null
+    })
   })
 })

yarn.lock

@@ -14397,10 +14397,10 @@ detective@^5.0.2:
     defined "^1.0.0"
     minimist "^1.1.1"
 
-devtools-protocol@0.0.1159816, devtools-protocol@0.0.1413303, devtools-protocol@0.0.927104:
-  version "0.0.1413303"
-  resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.1413303.tgz#72a194e7474a17cd75f8c1d2627db0563e2f719e"
-  integrity sha512-AjVpl/7DdE1gf40ydrVpBdGYprq/seOLgN46p+rYyJ/lfhrI6e4zvX0HWSr3cIvj16Ks9kwEdmvmwlyKcELBBw==
+devtools-protocol@0.0.1159816, devtools-protocol@0.0.1459876, devtools-protocol@0.0.927104:
+  version "0.0.1459876"
+  resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.1459876.tgz#07f69c1921ae89624f65ddd311d2214e8cb35e1e"
+  integrity sha512-9Dng0X6IdYO8CxlNlOYW+Jc8deGZdOQOL4Sy2UbA+XiCy1Xxi7QtP5CWZKEYv4EEfp7hxp7LhF6RQWfUXK1+/w==
 
 dicer@0.2.5:
   version "0.2.5"