From 7f4537543987b60fda7d8dce8447fac21eaeb894 Mon Sep 17 00:00:00 2001 From: Chris Breiding Date: Wed, 23 Aug 2023 15:16:27 -0400 Subject: [PATCH] breaking: Upgrade @cypress/request to 3.0.0 (#27495) --- cli/CHANGELOG.md | 5 +++-- cli/package.json | 2 +- package.json | 2 +- packages/driver/cypress/e2e/commands/net_stubbing.cy.ts | 4 ++-- packages/https-proxy/package.json | 2 +- packages/network/package.json | 2 +- packages/proxy/package.json | 2 +- packages/server/package.json | 2 +- system-tests/package.json | 2 +- yarn.lock | 8 ++++---- 10 files changed, 16 insertions(+), 15 deletions(-) diff --git a/cli/CHANGELOG.md b/cli/CHANGELOG.md index 4f519443c5..ed618397fb 100644 --- a/cli/CHANGELOG.md +++ b/cli/CHANGELOG.md @@ -12,7 +12,8 @@ _Released 08/22/2023 (PENDING)_ - The current spec path is now passed from the AUT iframe using a query parameter rather than a path segment. This allows for requests for assets at relative paths to be correctly forwarded to the dev server. Fixes [#26725](https://github.com/cypress-io/cypress/issues/26725). - The deprecated configuration option, `nodeVersion` has been removed. Addresses [#27016](https://github.com/cypress-io/cypress/issues/27016). - The properties and values returned by the [Module API](https://docs.cypress.io/guides/guides/module-api) and included in the arguments of handlers for the [`after:run`](https://docs.cypress.io/api/plugins/after-run-api) and [`after:spec`](https://docs.cypress.io/api/plugins/after-spec-api) have been changed to be more consistent. Addresses [#23805](https://github.com/cypress-io/cypress/issues/23805). -- For Cypress Cloud runs with Test Replay enabled, the Cypress Runner UI is now hidden during the run since the Runner will be visible during Test Replay. As such, if video is recorded (which is now defaulted to `false`) during the run, the Runner will not be visible. In addition, if a runner screenshot (`cy.screenshot({ capture: runner })`) is captured, it will no longer contain the Runner. +- For Cypress Cloud runs with Test Replay enabled, the Cypress Runner UI is now hidden during the run since the Runner will be visible during Test Replay. As such, if video is recorded (which is now defaulted to `false`) during the run, the Runner will not be visible. In addition, if a runner screenshot (`cy.screenshot({ capture: runner })`) is captured, it will no longer contain the Runner. +- Upgraded [`@cypress/request`](https://www.npmjs.com/package/@cypress/request) from `^2.88.11` to `^3.0.0`. Redirects between http and https are no longer supported by [`cy.visit()`](/api/commands/visit) and [`cy.request()`](/api/commands/request). Addresses [#27535](https://github.com/cypress-io/cypress/issues/27535). Addressed in [#27495](https://github.com/cypress-io/cypress/pull/27495). **Features:** @@ -20,7 +21,7 @@ _Released 08/22/2023 (PENDING)_ ## 12.17.5 -_Released 08/29/2023 (PENDING)_ +_Released 08/29/2023 (PENDING)_ **Bugfixes:** diff --git a/cli/package.json b/cli/package.json index 3c69a31637..658801a59a 100644 --- a/cli/package.json +++ b/cli/package.json @@ -20,7 +20,7 @@ "unit": "cross-env BLUEBIRD_DEBUG=1 NODE_ENV=test mocha --reporter mocha-multi-reporters --reporter-options configFile=../mocha-reporter-config.json" }, "dependencies": { - "@cypress/request": "2.88.12", + "@cypress/request": "^3.0.0", "@cypress/xvfb": "^1.2.4", "@types/node": "^16.18.39", "@types/sinonjs__fake-timers": "8.1.1", diff --git a/package.json b/package.json index abed82f966..6368dd2f9e 100644 --- a/package.json +++ b/package.json @@ -72,7 +72,7 @@ "devDependencies": { "@aws-sdk/credential-providers": "3.53.0", "@cypress/questions-remain": "1.0.1", - "@cypress/request": "2.88.12", + "@cypress/request": "^3.0.0", "@cypress/request-promise": "4.2.7", "@electron/fuses": "1.6.1", "@electron/notarize": "^2.1.0", diff --git a/packages/driver/cypress/e2e/commands/net_stubbing.cy.ts b/packages/driver/cypress/e2e/commands/net_stubbing.cy.ts index 4a73f071c2..14c37f49eb 100644 --- a/packages/driver/cypress/e2e/commands/net_stubbing.cy.ts +++ b/packages/driver/cypress/e2e/commands/net_stubbing.cy.ts @@ -938,8 +938,8 @@ describe('network stubbing', { retries: 15 }, function () { cy.intercept('*') const url4 = 'http://localhost:3501/fixtures/generic.html' const url3 = `http://localhost:3501/redirect?href=${encodeURIComponent(url4)}` - const url2 = `https://localhost:3502/redirect?chunked=1&href=${encodeURIComponent(url3)}` - const url1 = `https://localhost:3502/redirect?chunked=1&href=${encodeURIComponent(url2)}` + const url2 = `http://foobar.com:3500/redirect?chunked=1&href=${encodeURIComponent(url3)}` + const url1 = `http://foobar.com:3500/redirect?chunked=1&href=${encodeURIComponent(url2)}` cy.visit(url1) .location('href').should('eq', url4) diff --git a/packages/https-proxy/package.json b/packages/https-proxy/package.json index dcf6b86691..cb47a6943f 100644 --- a/packages/https-proxy/package.json +++ b/packages/https-proxy/package.json @@ -24,7 +24,7 @@ }, "devDependencies": { "@cypress/debugging-proxy": "2.0.1", - "@cypress/request": "2.88.12", + "@cypress/request": "^3.0.0", "@cypress/request-promise": "4.2.7", "@packages/network": "0.0.0-development", "@packages/ts": "0.0.0-development", diff --git a/packages/network/package.json b/packages/network/package.json index 8b4f1c4123..21f17c9648 100644 --- a/packages/network/package.json +++ b/packages/network/package.json @@ -27,7 +27,7 @@ }, "devDependencies": { "@cypress/debugging-proxy": "2.0.1", - "@cypress/request": "2.88.12", + "@cypress/request": "^3.0.0", "@cypress/request-promise": "4.2.7", "@packages/https-proxy": "0.0.0-development", "@packages/socket": "0.0.0-development", diff --git a/packages/proxy/package.json b/packages/proxy/package.json index d43c9095f3..a8707695b2 100644 --- a/packages/proxy/package.json +++ b/packages/proxy/package.json @@ -28,7 +28,7 @@ "utf8-stream": "0.0.0" }, "devDependencies": { - "@cypress/request": "2.88.12", + "@cypress/request": "^3.0.0", "@cypress/request-promise": "4.2.7", "@cypress/sinon-chai": "2.9.1", "@packages/resolve-dist": "0.0.0-development", diff --git a/packages/server/package.json b/packages/server/package.json index 09960852d4..6d71fd615d 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -26,7 +26,7 @@ "@benmalka/foxdriver": "0.4.1", "@cypress/commit-info": "2.2.0", "@cypress/get-windows-proxy": "1.6.2", - "@cypress/request": "2.88.12", + "@cypress/request": "^3.0.0", "@cypress/request-promise": "4.2.7", "@cypress/vite-dev-server": "0.0.0-development", "@cypress/webpack-batteries-included-preprocessor": "0.0.0-development", diff --git a/system-tests/package.json b/system-tests/package.json index 351fe59f5d..c67be4060d 100644 --- a/system-tests/package.json +++ b/system-tests/package.json @@ -22,7 +22,7 @@ "@babel/preset-env": "7.22.9", "@cypress/commit-info": "2.2.0", "@cypress/debugging-proxy": "2.0.1", - "@cypress/request": "2.88.12", + "@cypress/request": "^3.0.0", "@cypress/request-promise": "4.2.7", "@cypress/sinon-chai": "2.9.1", "@cypress/webpack-preprocessor": "0.0.0-development", diff --git a/yarn.lock b/yarn.lock index af32eda807..94f4b53f9e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2368,10 +2368,10 @@ stealthy-require "^1.1.1" tough-cookie "^4.1.3" -"@cypress/request@2.88.12": - version "2.88.12" - resolved "https://registry.yarnpkg.com/@cypress/request/-/request-2.88.12.tgz#ba4911431738494a85e93fb04498cb38bc55d590" - integrity sha512-tOn+0mDZxASFM+cuAP9szGUGPI1HwWVSvdzm7V4cCsPdFTx6qMj29CwaQmRAMIEhORIUBFBsYROYJcveK4uOjA== +"@cypress/request@^3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@cypress/request/-/request-3.0.0.tgz#7f58dfda087615ed4e6aab1b25fffe7630d6dd85" + integrity sha512-GKFCqwZwMYmL3IBoNeR2MM1SnxRIGERsQOTWeQKoYBt2JLqcqiy7JXqO894FLrpjZYqGxW92MNwRH2BN56obdQ== dependencies: aws-sign2 "~0.7.0" aws4 "^1.8.0"