Skip to content

Commit

Permalink
Merge branch 'release/14.0.0' into ryanm/chore/electron-upgrade
Browse files Browse the repository at this point in the history
  • Loading branch information
ryanthemanuel authored Oct 28, 2024
2 parents ce6cbad + fd8c2a3 commit 82f6c39
Show file tree
Hide file tree
Showing 15 changed files with 34 additions and 156 deletions.
2 changes: 1 addition & 1 deletion .circleci/cache-version.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Bump this version to force CI to re-create the cache from scratch.

10-23-2024
10-28-24
2 changes: 1 addition & 1 deletion browser-versions.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"chrome:beta": "131.0.6778.3",
"chrome:beta": "131.0.6778.13",
"chrome:stable": "130.0.6723.69",
"chrome:minimum": "64.0.3282.0"
}
3 changes: 2 additions & 1 deletion cli/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ _Released 12/3/2024 (PENDING)_

- Removed support for Node.js 16 and Node.js 21. Addresses [#29930](https://github.com/cypress-io/cypress/issues/29930).
- Prebuilt binaries for Linux are no longer compatible with Linux distributions based on glibc <2.28, for example: Ubuntu 14-18, RHEL 7, CentOS 7, Amazon Linux 2. Addresses [#29601](https://github.com/cypress-io/cypress/issues/29601).
- The `cypress open-ct` and `cypress run-ct` CLI commands were removed. Please use `cypress open --component` or `cypress run --component` respectively instead. Addressed in [#30456](https://github.com/cypress-io/cypress/pull/30456)
- The undocumented methods `Cypress.backend('firefox:force:gc')` and `Cypress.backend('log:memory:pressure')` were removed. Addresses [#30222](https://github.com/cypress-io/cypress/issues/30222).
- Upgraded bundled Node.js version from `18.17.0` to `20.18.0`. Addresses [#29547](https://github.com/cypress-io/cypress/issues/29547).
- It is no longer possible to do things like `cy.window().then((win) => win.fetch('<some-url>')` without doing some form of initial navigation via `cy.visit()`. `cy.request` will still work in this scenario. Addressed in [#29547](https://github.com/cypress-io/cypress/pull/30394).
Expand All @@ -22,7 +23,7 @@ _Released 12/3/2024 (PENDING)_

## 13.15.1

_Released 10/1/2024 (PENDING)_
_Released 10/24/2024_

**Bugfixes:**

Expand Down
20 changes: 0 additions & 20 deletions cli/__snapshots__/cli_spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -223,10 +223,6 @@ exports['cli help command shows help 1'] = `
version [options] prints Cypress version
open [options] Opens Cypress in the interactive GUI.
run [options] Runs Cypress tests from the CLI without the GUI
open-ct [options] Opens Cypress component testing interactive mode.
Deprecated: use "open --component"
run-ct [options] Runs all Cypress component testing suites. Deprecated:
use "run --component"
install [options] Installs the Cypress executable matching this package's
version
verify [options] Verifies that Cypress is installed correctly and
Expand Down Expand Up @@ -263,10 +259,6 @@ exports['cli help command shows help for -h 1'] = `
version [options] prints Cypress version
open [options] Opens Cypress in the interactive GUI.
run [options] Runs Cypress tests from the CLI without the GUI
open-ct [options] Opens Cypress component testing interactive mode.
Deprecated: use "open --component"
run-ct [options] Runs all Cypress component testing suites. Deprecated:
use "run --component"
install [options] Installs the Cypress executable matching this package's
version
verify [options] Verifies that Cypress is installed correctly and
Expand Down Expand Up @@ -303,10 +295,6 @@ exports['cli help command shows help for --help 1'] = `
version [options] prints Cypress version
open [options] Opens Cypress in the interactive GUI.
run [options] Runs Cypress tests from the CLI without the GUI
open-ct [options] Opens Cypress component testing interactive mode.
Deprecated: use "open --component"
run-ct [options] Runs all Cypress component testing suites. Deprecated:
use "run --component"
install [options] Installs the Cypress executable matching this package's
version
verify [options] Verifies that Cypress is installed correctly and
Expand Down Expand Up @@ -344,10 +332,6 @@ exports['cli unknown command shows usage and exits 1'] = `
version [options] prints Cypress version
open [options] Opens Cypress in the interactive GUI.
run [options] Runs Cypress tests from the CLI without the GUI
open-ct [options] Opens Cypress component testing interactive mode.
Deprecated: use "open --component"
run-ct [options] Runs all Cypress component testing suites. Deprecated:
use "run --component"
install [options] Installs the Cypress executable matching this package's
version
verify [options] Verifies that Cypress is installed correctly and
Expand Down Expand Up @@ -457,10 +441,6 @@ exports['cli CYPRESS_INTERNAL_ENV allows and warns when staging environment 1']
version [options] prints Cypress version
open [options] Opens Cypress in the interactive GUI.
run [options] Runs Cypress tests from the CLI without the GUI
open-ct [options] Opens Cypress component testing interactive mode.
Deprecated: use "open --component"
run-ct [options] Runs all Cypress component testing suites. Deprecated:
use "run --component"
install [options] Installs the Cypress executable matching this package's
version
verify [options] Verifies that Cypress is installed correctly and
Expand Down
76 changes: 0 additions & 76 deletions cli/lib/cli.js
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,6 @@ const knownCommands = [
'install',
'open',
'run',
'open-ct',
'run-ct',
'verify',
'-v',
'--version',
Expand Down Expand Up @@ -482,80 +480,6 @@ module.exports = {
.catch(util.logErrorExit1)
})

program
.command('open-ct')
.usage('[options]')
.description('Opens Cypress component testing interactive mode. Deprecated: use "open --component"')
.option('-b, --browser <browser-path>', text('browser'))
.option('-c, --config <config>', text('config'))
.option('-C, --config-file <config-file>', text('configFile'))
.option('-d, --detached [bool]', text('detached'), coerceFalse)
.option('-e, --env <env>', text('env'))
.option('--global', text('global'))
.option('-p, --port <port>', text('port'))
.option('-P, --project <project-path>', text('project'))
.option('--dev', text('dev'), coerceFalse)
.action((opts) => {
debug('opening Cypress')

const msg = `
${logSymbols.warning} Warning: open-ct is deprecated and will be removed in a future release.
Use \`cypress open --component\` instead.
`

logger.warn()
logger.warn(stripIndent(msg))
logger.warn()

require('./exec/open')
.start({ ...util.parseOpts(opts), testingType: 'component' })
.then(util.exit)
.catch(util.logErrorExit1)
})

program
.command('run-ct')
.usage('[options]')
.description('Runs all Cypress component testing suites. Deprecated: use "run --component"')
.option('-b, --browser <browser-name-or-path>', text('browser'))
.option('--ci-build-id <id>', text('ciBuildId'))
.option('-c, --config <config>', text('config'))
.option('-C, --config-file <config-file>', text('configFile'))
.option('-e, --env <env>', text('env'))
.option('--group <name>', text('group'))
.option('-k, --key <record-key>', text('key'))
.option('--headed', text('headed'))
.option('--headless', text('headless'))
.option('--no-exit', text('exit'))
.option('--parallel', text('parallel'))
.option('-p, --port <port>', text('port'))
.option('-P, --project <project-path>', text('project'))
.option('-q, --quiet', text('quiet'))
.option('--record [bool]', text('record'), coerceFalse)
.option('-r, --reporter <reporter>', text('reporter'))
.option('-o, --reporter-options <reporter-options>', text('reporterOptions'))
.option('-s, --spec <spec>', text('spec'))
.option('-t, --tag <tag>', text('tag'))
.option('--dev', text('dev'), coerceFalse)
.action((opts) => {
debug('running Cypress run-ct')

const msg = `
${logSymbols.warning} Warning: run-ct is deprecated and will be removed in a future release.
Use \`cypress run --component\` instead.
`

logger.warn()
logger.warn(stripIndent(msg))
logger.warn()

require('./exec/run')
.start({ ...util.parseOpts(opts), testingType: 'component' })
.then(util.exit)
.catch(util.logErrorExit1)
})

program
.command('install')
.usage('[options]')
Expand Down
24 changes: 0 additions & 24 deletions cli/test/lib/cli_spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -635,34 +635,10 @@ describe('cli', () => {
expect(spawn.start.firstCall.args[0]).to.include('component')
})

it('spawns server with correct args for deprecated component-testing command', () => {
this.exec('open-ct --dev')
expect(spawn.start.firstCall.args[0]).to.include('--testing-type')
expect(spawn.start.firstCall.args[0]).to.include('component')
})

it('runs server with correct args for component-testing', () => {
this.exec('run --component --dev')
expect(spawn.start.firstCall.args[0]).to.include('--testing-type')
expect(spawn.start.firstCall.args[0]).to.include('component')
})

it('runs server with correct args for deprecated component-testing command', () => {
this.exec('run-ct --dev')
expect(spawn.start.firstCall.args[0]).to.include('--testing-type')
expect(spawn.start.firstCall.args[0]).to.include('component')
})

it('does display open-ct command in the help', () => {
return execa('bin/cypress', ['help']).then((result) => {
expect(result).to.include('open-ct')
})
})

it('does display run-ct command in the help', () => {
return execa('bin/cypress', ['help']).then((result) => {
expect(result).to.include('run-ct')
})
})
})
})
9 changes: 5 additions & 4 deletions nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,26 @@
"default",
"{workspaceRoot}/.eslintrc.js"
],
"cache": true
"cache": false
},
"check-ts": {
"inputs": [
"default",
"sharedGlobals"
],
"cache": true
"cache": false
},
"build": {
"dependsOn": [
"^build"
],
"cache": true
"cache": false
},
"build-prod": {
"dependsOn": [
"^build-prod"
]
],
"cache": false
}
},
"namedInputs": {
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cypress",
"version": "13.15.0",
"version": "13.15.1",
"description": "Cypress is a next generation front end testing tool built for the modern web",
"private": true,
"scripts": {
Expand Down Expand Up @@ -31,7 +31,7 @@
"cypress:open:debug": "node ./scripts/debug.js cypress:open",
"precypress:run": "yarn ensure-deps",
"cypress:run": "cypress run --dev",
"cypress:run:ct": "cypress run-ct --dev",
"cypress:run:ct": "cypress run --component --dev",
"precypress:run:debug": "yarn ensure-deps",
"cypress:run:debug": "node ./scripts/debug.js cypress:run",
"cypress:verify": "cypress verify --dev",
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions packages/errors/src/errors.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1257,9 +1257,9 @@ export const AllCypressErrors = {
Please remove this flag from: ${fmt.path(arg1.configFile)}
Component Testing is now a standalone command. You can now run your component tests with:
Component Testing is now a supported testing type. You can run your component tests with:
${fmt.terminal(`cypress open-ct`)}
${fmt.terminal(`cypress open --component`)}
https://on.cypress.io/migration-guide`
},
Expand Down
18 changes: 12 additions & 6 deletions packages/extension/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,19 @@ yarn workspace @packages/extension test-debug
### In Chrome

1. Open Chrome
2. Go into Extensions
3. Check **Developer Mode**
4. Click **Load unpacked extension...**
5. Choose **packages/extension/dist** directory
6. Click **background page** to debug `background.js`
2. Go into Extensions (`chrome://extensions`)
3. Check **Developer Mode** (top right of screen)
4. Click **Load unpacked extension...** (top left of screen)
5. Choose **packages/extension/dist** directory (v2)
6. Click **background page** to debug `background.js` (inspect views `background page`)
7. Click **Reload (⌘R)** to pull in changes to `manifest.json`

### In Firefox

To be written...
1. Launch Firefox via `cypress open`.
2. Once Firefox is open, open an new tab and navigate to `about:debugging`.
3. Click the `This Firefox` navigation item on the left hand navigation pane and locate the `Cypress` extension under `Temporary Extensions`.
4. Click `inspect`. A console window should now appear in a separate window.
5. Close the `about:debugging` tab.
6. In the newly spawned console window, you should be able to see `background.js` in the `Debugger` tab.
7. Set breakpoints as needed to inspect what code you are trying to debug. Happy debugging!
2 changes: 1 addition & 1 deletion system-tests/test/run_ct_spec.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const systemTests = require('../lib/system-tests').default

describe('run-ct', () => {
describe('run ct', () => {
systemTests.setup()

systemTests.it('reports correct exit code when failing', {
Expand Down
10 changes: 2 additions & 8 deletions tooling/v8-snapshot/cache/darwin/snapshot-meta.json
Original file line number Diff line number Diff line change
Expand Up @@ -1056,8 +1056,6 @@
"./node_modules/@cypress/commit-info/src/index.js",
"./node_modules/@cypress/commit-info/src/utils.js",
"./node_modules/@cypress/get-windows-proxy/node_modules/debug/src/common.js",
"./node_modules/@cypress/get-windows-proxy/node_modules/registry-js/dist/lib/index.js",
"./node_modules/@cypress/get-windows-proxy/node_modules/registry-js/dist/lib/registry.js",
"./node_modules/@cypress/get-windows-proxy/src/index.js",
"./node_modules/@cypress/parse-domain/build/tries/icann.complete.json",
"./node_modules/@cypress/parse-domain/build/tries/private.complete.json",
Expand Down Expand Up @@ -1564,6 +1562,7 @@
"./node_modules/binary-extensions/index.js",
"./node_modules/binaryextensions/edition-es5/index.js",
"./node_modules/bindings/bindings.js",
"./node_modules/brace-expansion/index.js",
"./node_modules/braces/index.js",
"./node_modules/braces/lib/compile.js",
"./node_modules/braces/lib/constants.js",
Expand Down Expand Up @@ -2183,6 +2182,7 @@
"./node_modules/is-fullwidth-code-point/index.js",
"./node_modules/is-glob/index.js",
"./node_modules/is-html/index.js",
"./node_modules/is-obj/index.js",
"./node_modules/is-plain-obj/index.js",
"./node_modules/is-regexp/index.js",
"./node_modules/is-stream/index.js",
Expand Down Expand Up @@ -2442,7 +2442,6 @@
"./node_modules/mime-types/index.js",
"./node_modules/mime/types.json",
"./node_modules/min-indent/index.js",
"./node_modules/minimatch/node_modules/brace-expansion/index.js",
"./node_modules/minimist/index.js",
"./node_modules/mocha-7.0.1/lib/browser/progress.js",
"./node_modules/mocha-7.0.1/lib/context.js",
Expand All @@ -2464,7 +2463,6 @@
"./node_modules/mocha-7.0.1/lib/reporters/markdown.js",
"./node_modules/mocha-7.0.1/lib/stats-collector.js",
"./node_modules/mocha-7.0.1/lib/utils.js",
"./node_modules/mocha-7.0.1/node_modules/brace-expansion/index.js",
"./node_modules/mocha-7.0.1/node_modules/debug/node_modules/ms/index.js",
"./node_modules/mocha-7.0.1/node_modules/debug/src/common.js",
"./node_modules/mocha-7.0.1/node_modules/glob/common.js",
Expand Down Expand Up @@ -3154,8 +3152,6 @@
"./node_modules/recast/parsers/babel.js",
"./node_modules/recast/parsers/esprima.js",
"./node_modules/recast/parsers/typescript.js",
"./node_modules/registry-js/dist/lib/index.js",
"./node_modules/registry-js/dist/lib/registry.js",
"./node_modules/request-promise-core/configure/request2.js",
"./node_modules/request-promise-core/errors.js",
"./node_modules/request-promise-core/lib/errors.js",
Expand Down Expand Up @@ -3295,7 +3291,6 @@
"./node_modules/stream-shift/index.js",
"./node_modules/string-width/index.js",
"./node_modules/stringify-object/index.js",
"./node_modules/stringify-object/node_modules/is-obj/index.js",
"./node_modules/strip-ansi/index.js",
"./node_modules/strip-eof/index.js",
"./node_modules/strip-final-newline/index.js",
Expand Down Expand Up @@ -3601,7 +3596,6 @@
"./packages/data-context/node_modules/ast-types/lib/shared.js",
"./packages/data-context/node_modules/ast-types/lib/types.js",
"./packages/data-context/node_modules/ast-types/main.js",
"./packages/data-context/node_modules/brace-expansion/index.js",
"./packages/data-context/node_modules/cross-spawn/index.js",
"./packages/data-context/node_modules/cross-spawn/lib/enoent.js",
"./packages/data-context/node_modules/cross-spawn/lib/parse.js",
Expand Down
Loading

1 comment on commit 82f6c39

@cypress-bot
Copy link
Contributor

@cypress-bot cypress-bot bot commented on 82f6c39 Oct 28, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Circle has built the linux arm64 version of the Test Runner.

Learn more about this pre-release build at https://on.cypress.io/advanced-installation#Install-pre-release-version

Run this command to install the pre-release locally:

npm install https://cdn.cypress.io/beta/npm/14.0.0/linux-arm64/ryanm/chore/electron-upgrade-82f6c3947f5ca01978b699ca2a5b820aad9ac88d/cypress.tgz

Please sign in to comment.