Skip to content

Commit 0a9bece

Browse files
Merge branch 'develop' into electron-34
2 parents 2ab3b0f + eb5fe56 commit 0a9bece

File tree

66 files changed

+641
-536
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+641
-536
lines changed

.circleci/workflows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: 2.1
22

33
chrome-stable-version: &chrome-stable-version "135.0.7049.84"
4-
chrome-beta-version: &chrome-beta-version "136.0.7103.17"
4+
chrome-beta-version: &chrome-beta-version "136.0.7103.25"
55
firefox-stable-version: &firefox-stable-version "137.0"
66

77
orbs:

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -398,4 +398,7 @@ tooling/v8-snapshot/cache/prod-win32
398398
system-tests/lib/validations
399399

400400
.nx/cache
401-
.nx/workspace-data
401+
.nx/workspace-data
402+
403+
# IDE files
404+
.cursor

cli/CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,16 @@
33

44
_Released 4/22/2025 (PENDING)_
55

6+
**Bugfixes:**
7+
8+
- The [`cy.press()`](http://on.cypress.io/api/press) command no longer errors when used in specs subsequent to the first spec in run mode. Fixes [#31466](https://github.com/cypress-io/cypress/issues/31466).
9+
10+
**Misc:**
11+
12+
- Suppress benign warnings that reference OOM score of renderer. Addresses [#29563](https://github.com/cypress-io/cypress/issues/29563). Addressed in [#31521](https://github.com/cypress-io/cypress/pull/31521).
13+
- The UI of the reporter and URL were updated to a darker gray background for better color contrast. Addressed in [#31475](https://github.com/cypress-io/cypress/pull/31475).
14+
- Fixed an issue where the error message output when attempting to install Cypress on an unsupported architecture included an outdated documentation link to Cypress system requirements. Fixes [#31512](https://github.com/cypress-io/cypress/issues/31512).
15+
616
**Dependency Updates:**
717

818
- Upgraded `electron` from `33.2.1` to `34.3.3`. Addresses [#31245](https://github.com/cypress-io/cypress/issues/31245). Addressed in [#31260](https://github.com/cypress-io/cypress/pull/31260).

cli/__snapshots__/install_spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ Installing Cypress (version: 1.2.3)
274274
exports['error when installing on unsupported os'] = `
275275
Error: The Cypress App could not be installed. Your machine does not meet the operating system requirements.
276276
277-
https://on.cypress.io/guides/getting-started/installing-cypress#system-requirements
277+
https://on.cypress.io/app/get-started/install-cypress#System-requirements
278278
279279
----------
280280

cli/lib/errors.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ const invalidOS = {
4242
description: 'The Cypress App could not be installed. Your machine does not meet the operating system requirements.',
4343
solution: stripIndent`
4444
45-
${chalk.blue('https://on.cypress.io/guides/getting-started/installing-cypress#system-requirements')}`,
45+
${chalk.blue('https://on.cypress.io/app/get-started/install-cypress#System-requirements')}`,
4646
}
4747

4848
const failedDownload = {

cli/lib/exec/spawn.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,11 @@ const readline = require('readline')
1616
const isXlibOrLibudevRe = /^(?:Xlib|libudev)/
1717
const isHighSierraWarningRe = /\*\*\* WARNING/
1818
const isRenderWorkerRe = /\.RenderWorker-/
19+
// This is a warning that occurs when running in a container on Linux.
20+
// https://github.com/cypress-io/cypress/issues/29563
21+
// Example:
22+
// [437:1212/125803.148706:ERROR:zygote_host_impl_linux.cc(273)] Failed to adjust OOM score of renderer with pid 610: Permission denied (13)
23+
const isOOMScoreWarningRe = /Failed to adjust OOM score of renderer with pid/
1924

2025
// Chromium (which Electron uses) always makes several attempts to connect to the system dbus.
2126
// This works fine in most desktop environments, but in a docker container, there is no dbus service
@@ -100,6 +105,7 @@ const GARBAGE_WARNINGS = [
100105
isXlibOrLibudevRe,
101106
isHighSierraWarningRe,
102107
isRenderWorkerRe,
108+
isOOMScoreWarningRe,
103109
isDbusWarning,
104110
isCertVerifyProcBuiltin,
105111
isHostVulkanDriverWarning,

cli/test/lib/exec/spawn_spec.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,8 @@ describe('lib/exec/spawn', function () {
9999
[78887:1023/114920.074882:ERROR:debug_utils.cc(14)] Hit debug scenario: 4
100100
101101
[18489:0822/130231.159571:ERROR:gl_display.cc(497)] EGL Driver message (Error) eglQueryDeviceAttribEXT: Bad attribute.
102+
103+
[437:1212/125803.148706:ERROR:zygote_host_impl_linux.cc(273)] Failed to adjust OOM score of renderer with pid 610: Permission denied (13)
102104
`
103105

104106
const lines = _
@@ -124,6 +126,10 @@ describe('lib/exec/spawn', function () {
124126
it('returns true for GLX driver errors', () => {
125127
expect(spawn.isGarbageLineWarning('glx: failed to create drisw screen')).to.be.true
126128
})
129+
130+
it('returns true for OOM score adjustment warnings', () => {
131+
expect(spawn.isGarbageLineWarning('[437:1212/125803.148706:ERROR:zygote_host_impl_linux.cc(273)] Failed to adjust OOM score of renderer with pid 610: Permission denied (13)')).to.be.true
132+
})
127133
})
128134

129135
context('.start', function () {

npm/mount-utils/tsconfig.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
// "inlineSources": true, /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */
4444

4545
/* Experimental Options */
46-
// "experimentalDecorators": true, /* Enables experimental support for ES7 decorators. */
4746
// "emitDecoratorMetadata": true, /* Enables experimental support for emitting type metadata for decorators. */
4847
"esModuleInterop": true
4948
},

npm/vite-dev-server/tsconfig.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
// "inlineSources": true, /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */
4343

4444
/* Experimental Options */
45-
// "experimentalDecorators": true, /* Enables experimental support for ES7 decorators. */
4645
// "emitDecoratorMetadata": true, /* Enables experimental support for emitting type metadata for decorators. */
4746
"esModuleInterop": true,
4847
/** Allows us to strip internal types sourced from webpack */

npm/vite-plugin-cypress-esm/tsconfig.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
// "inlineSources": true, /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */
4343

4444
/* Experimental Options */
45-
// "experimentalDecorators": true, /* Enables experimental support for ES7 decorators. */
4645
// "emitDecoratorMetadata": true, /* Enables experimental support for emitting type metadata for decorators. */
4746
"esModuleInterop": true,
4847
/** Allows us to strip internal types sourced from webpack */

0 commit comments

Comments
 (0)