From 16670bbfb9c9f1617b6672913fa6758dc12b62a4 Mon Sep 17 00:00:00 2001 From: Bill Glesias Date: Tue, 13 Aug 2024 13:16:53 -0400 Subject: [PATCH] =?UTF-8?q?chore:=20Revert=20"misc:=20allow=20HiDPI=20Scre?= =?UTF-8?q?en=20running=20wayland=20to=20use=20cypress=20window/browse?= =?UTF-8?q?=E2=80=A6"=20(#30029)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cli/CHANGELOG.md | 1 - cli/lib/exec/spawn.js | 2 +- cli/test/lib/exec/spawn_spec.js | 4 ---- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/cli/CHANGELOG.md b/cli/CHANGELOG.md index 002aadcce1ea..61320615f5c7 100644 --- a/cli/CHANGELOG.md +++ b/cli/CHANGELOG.md @@ -11,7 +11,6 @@ _Released 8/13/2024 (PENDING)_ **Misc:** - Updated `cypress open` hints displayed after Cypress binary install. Addresses [#29935](https://github.com/cypress-io/cypress/issues/29935). -- Allow HiDPI Screen running wayland to use cypress window/browser by adding `--ozone-platform=auto` flag to the electron's runtime argument. Addresses [#20891](https://github.com/cypress-io/cypress/issues/20891). **Dependency Updates:** diff --git a/cli/lib/exec/spawn.js b/cli/lib/exec/spawn.js index 63c7312677b3..e132b964e0a3 100644 --- a/cli/lib/exec/spawn.js +++ b/cli/lib/exec/spawn.js @@ -155,7 +155,7 @@ module.exports = { const { onStderrData } = overrides const envOverrides = util.getEnvOverrides(options) - const electronArgs = ['--ozone-platform=auto'] + const electronArgs = [] const node11WindowsFix = isPlatform('win32') let startScriptPath diff --git a/cli/test/lib/exec/spawn_spec.js b/cli/test/lib/exec/spawn_spec.js index 1c85deb9c8d4..26ad6d6713e7 100644 --- a/cli/test/lib/exec/spawn_spec.js +++ b/cli/test/lib/exec/spawn_spec.js @@ -121,7 +121,6 @@ describe('lib/exec/spawn', function () { return spawn.start('--foo', { foo: 'bar' }) .then(() => { expect(cp.spawn).to.be.calledWithMatch('/path/to/cypress', [ - '--ozone-platform=auto', '--', '--foo', '--cwd', @@ -149,7 +148,6 @@ describe('lib/exec/spawn', function () { const args = cp.spawn.firstCall.args.slice(0, 2) // it is important for "--no-sandbox" to appear before "--" separator const expectedCliArgs = [ - '--ozone-platform=auto', '--no-sandbox', '--', '--foo', @@ -175,7 +173,6 @@ describe('lib/exec/spawn', function () { .then(() => { expect(cp.spawn).to.be.calledWithMatch('node', [ p, - '--ozone-platform=auto', '--', '--foo', '--cwd', @@ -201,7 +198,6 @@ describe('lib/exec/spawn', function () { .then(() => { expect(cp.spawn).to.be.calledWithMatch('node', [ p, - '--ozone-platform=auto', '--', '--foo', '--cwd',