From dbb9059b45050adbbef66171a05aaf30f35521e7 Mon Sep 17 00:00:00 2001 From: filip mertens Date: Sat, 16 Mar 2024 15:47:06 +0100 Subject: [PATCH] prevent menu e2e --- .circleci/config.yml | 4 ++-- apps/remixdesktop/src/main.ts | 4 ++-- apps/remixdesktop/test/nighwatch.app.ts | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b9a27cc036..0440c145fc 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -500,8 +500,8 @@ jobs: command: | nvm use 20 cd apps/remixdesktop - yarn installRipGrepMacOXx64 - PUBLISH_FOR_PULL_REQUEST='false' USE_HARD_LINKS=false yarn dist --x64 + yarn installRipGrepMacOXarm64 + PUBLISH_FOR_PULL_REQUEST='false' USE_HARD_LINKS=false yarn dist --arm64 - run: name: "Run tests" command: | diff --git a/apps/remixdesktop/src/main.ts b/apps/remixdesktop/src/main.ts index b42e4eca68..1020542815 100644 --- a/apps/remixdesktop/src/main.ts +++ b/apps/remixdesktop/src/main.ts @@ -132,8 +132,8 @@ const menu = [...(process.platform === 'darwin' ? [darwinMenu(commandKeys, execC WindowMenu(commandKeys, execCommand, []), HelpMenu(commandKeys, execCommand), ] - -Menu.setApplicationMenu(Menu.buildFromTemplate(menu)) +if(!isE2E) + Menu.setApplicationMenu(Menu.buildFromTemplate(menu)) diff --git a/apps/remixdesktop/test/nighwatch.app.ts b/apps/remixdesktop/test/nighwatch.app.ts index 1643977bf3..b0845dba3c 100644 --- a/apps/remixdesktop/test/nighwatch.app.ts +++ b/apps/remixdesktop/test/nighwatch.app.ts @@ -72,7 +72,7 @@ module.exports = { javascriptEnabled: true, acceptSslCerts: true, 'goog:chromeOptions': { - "binary": "release/mac/Remix-Desktop.app/Contents/MacOS/Remix-Desktop", + "binary": "release/mac-arm64/Remix-Desktop.app/Contents/MacOS/Remix-Desktop", "args": [ "--e2e", ]