From 7f0cd31440d4382c70cd55a53f2be6c66929d469 Mon Sep 17 00:00:00 2001
From: Mike McCready <66998419+MikeMcC399@users.noreply.github.com>
Date: Mon, 4 Nov 2024 14:23:55 +0100
Subject: [PATCH 1/2] misc: correct CLI help typo for cypress open --global

---
 cli/CHANGELOG.md              | 1 +
 cli/__snapshots__/cli_spec.js | 2 +-
 cli/lib/cli.js                | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/cli/CHANGELOG.md b/cli/CHANGELOG.md
index c3b652f883b3..b3f17d136a84 100644
--- a/cli/CHANGELOG.md
+++ b/cli/CHANGELOG.md
@@ -21,6 +21,7 @@ _Released 10/24/2024_
 - Cypress now consumes [geckodriver](https://firefox-source-docs.mozilla.org/testing/geckodriver/index.html) to help automate the Firefox browser instead of [marionette-client](https://github.com/cypress-io/marionette-client). Addresses [#30217](https://github.com/cypress-io/cypress/issues/30217).
 - Cypress now consumes [webdriver](https://github.com/webdriverio/webdriverio/tree/main/packages/webdriver) to help automate the Firefox browser and [firefox-profile](https://github.com/saadtazi/firefox-profile-js) to create a firefox profile and convert it to Base64 to save user screen preferences via `xulstore.json`. Addresses [#30300](https://github.com/cypress-io/cypress/issues/30300) and [#30301](https://github.com/cypress-io/cypress/issues/30301).
 - Pass spec information to protocol's `beforeSpec` to improve troubleshooting when reporting on errors. Addressed in [#30316](https://github.com/cypress-io/cypress/pull/30316).
+- Fixed a typo in CLI `global` option help text. Addresses [#30531](https://github.com/cypress-io/cypress/issues/30531).
 
 **Dependency Updates:**
 
diff --git a/cli/__snapshots__/cli_spec.js b/cli/__snapshots__/cli_spec.js
index 6cca25fe06c9..feed7158b7d4 100644
--- a/cli/__snapshots__/cli_spec.js
+++ b/cli/__snapshots__/cli_spec.js
@@ -33,7 +33,7 @@ exports['shows help for open --foo 1'] = `
                                      multiple values with a comma. overrides any
                                      value in cypress.config.{js,ts,mjs,cjs} or
                                      cypress.env.json
-    --global                         force Cypress into global mode as if its
+    --global                         force Cypress into global mode as if it were
                                      globally installed
     -p, --port <port>                runs Cypress on a specific port. overrides
                                      any value in cypress.config.{js,ts,mjs,cjs}.
diff --git a/cli/lib/cli.js b/cli/lib/cli.js
index 2be77ecd3943..5cec42cafb1c 100644
--- a/cli/lib/cli.js
+++ b/cli/lib/cli.js
@@ -110,7 +110,7 @@ const descriptions = {
   env: 'sets environment variables. separate multiple values with a comma. overrides any value in cypress.config.{js,ts,mjs,cjs} or cypress.env.json',
   exit: 'keep the browser open after tests finish',
   forceInstall: 'force install the Cypress binary',
-  global: 'force Cypress into global mode as if its globally installed',
+  global: 'force Cypress into global mode as if it were globally installed',
   group: 'a named group for recorded runs in Cypress Cloud',
   headed: 'displays the browser instead of running headlessly',
   headless: 'hide the browser instead of running headed (default for cypress run)',

From d75423e966c7e1290227d4be5c13ff39c539255f Mon Sep 17 00:00:00 2001
From: Mike McCready <66998419+MikeMcC399@users.noreply.github.com>
Date: Mon, 4 Nov 2024 14:29:43 +0100
Subject: [PATCH 2/2] move changelog entry to correct version

---
 cli/CHANGELOG.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/cli/CHANGELOG.md b/cli/CHANGELOG.md
index b3f17d136a84..10e38351f96e 100644
--- a/cli/CHANGELOG.md
+++ b/cli/CHANGELOG.md
@@ -3,6 +3,10 @@
 
 _Released 11/5/2024 (PENDING)_
 
+**Misc:**
+
+- Fixed a typo in CLI `global` option help text. Addresses [#30531](https://github.com/cypress-io/cypress/issues/30531).
+
 **Dependency Updates:**
 
 - Updated `@cypress/request` from `3.0.4` to `3.0.6`. Addressed in [#30488](https://github.com/cypress-io/cypress/pull/30488).
@@ -21,7 +25,6 @@ _Released 10/24/2024_
 - Cypress now consumes [geckodriver](https://firefox-source-docs.mozilla.org/testing/geckodriver/index.html) to help automate the Firefox browser instead of [marionette-client](https://github.com/cypress-io/marionette-client). Addresses [#30217](https://github.com/cypress-io/cypress/issues/30217).
 - Cypress now consumes [webdriver](https://github.com/webdriverio/webdriverio/tree/main/packages/webdriver) to help automate the Firefox browser and [firefox-profile](https://github.com/saadtazi/firefox-profile-js) to create a firefox profile and convert it to Base64 to save user screen preferences via `xulstore.json`. Addresses [#30300](https://github.com/cypress-io/cypress/issues/30300) and [#30301](https://github.com/cypress-io/cypress/issues/30301).
 - Pass spec information to protocol's `beforeSpec` to improve troubleshooting when reporting on errors. Addressed in [#30316](https://github.com/cypress-io/cypress/pull/30316).
-- Fixed a typo in CLI `global` option help text. Addresses [#30531](https://github.com/cypress-io/cypress/issues/30531).
 
 **Dependency Updates:**