From 7885c1025467e4a079791d6384ff05b87de1614a Mon Sep 17 00:00:00 2001 From: yann300 Date: Tue, 11 Feb 2025 15:03:33 +0100 Subject: [PATCH 01/13] Create funding.json --- funding.json | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 funding.json diff --git a/funding.json b/funding.json new file mode 100644 index 0000000000..49e6f7d28d --- /dev/null +++ b/funding.json @@ -0,0 +1,5 @@ +{ + "opRetro": { + "projectId": "0x754c37e401e2527ab24b9d7ca3e042bfcbfebeef54a533f8833d46242d2c3017" + } +} From 56daa177b84f2fed350c6b68c985fd6b63884567 Mon Sep 17 00:00:00 2001 From: bunsenstraat Date: Tue, 11 Feb 2025 10:43:52 +0100 Subject: [PATCH 02/13] screenshot --- apps/remix-ide-e2e/src/commands/hidePopupPanel.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apps/remix-ide-e2e/src/commands/hidePopupPanel.ts b/apps/remix-ide-e2e/src/commands/hidePopupPanel.ts index dd646722a5..af10029216 100644 --- a/apps/remix-ide-e2e/src/commands/hidePopupPanel.ts +++ b/apps/remix-ide-e2e/src/commands/hidePopupPanel.ts @@ -9,7 +9,10 @@ class HidePopupPanel extends EventEmitter { return localStorage.getItem('did_show_popup_panel') }, [], function (result) { if (!result.value) { - browser.waitForElementVisible('*[data-id="popupPanelToggle"]') + + browser. + saveScreenshot('/reports/hidePopupPanel.png') + .waitForElementVisible('*[data-id="popupPanelToggle"]') .click('*[data-id="popupPanelToggle"]') } done() From cf39a52487fc16f51ee782992de72f46ce9e1661 Mon Sep 17 00:00:00 2001 From: bunsenstraat Date: Tue, 11 Feb 2025 11:14:13 +0100 Subject: [PATCH 03/13] screenshot --- apps/remix-ide-e2e/src/commands/hidePopupPanel.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/remix-ide-e2e/src/commands/hidePopupPanel.ts b/apps/remix-ide-e2e/src/commands/hidePopupPanel.ts index af10029216..d980bdf815 100644 --- a/apps/remix-ide-e2e/src/commands/hidePopupPanel.ts +++ b/apps/remix-ide-e2e/src/commands/hidePopupPanel.ts @@ -11,7 +11,7 @@ class HidePopupPanel extends EventEmitter { if (!result.value) { browser. - saveScreenshot('/reports/hidePopupPanel.png') + saveScreenshot('/reports/screenshots/hidePopupPanel.png') .waitForElementVisible('*[data-id="popupPanelToggle"]') .click('*[data-id="popupPanelToggle"]') } From cad9cd3087d817dcb6fbad4a4b483aa8a4d0b271 Mon Sep 17 00:00:00 2001 From: bunsenstraat Date: Tue, 11 Feb 2025 11:24:52 +0100 Subject: [PATCH 04/13] update browser tools --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4ac8815bdf..db340812c3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -5,7 +5,7 @@ parameters: type: boolean default: false orbs: - browser-tools: circleci/browser-tools@1.4.4 + browser-tools: circleci/browser-tools@1.5.2 win: circleci/windows@5.0 node: circleci/node@7.0.0 jobs: From 1bf59f631c9da44e124a216c511ce32b4e20423d Mon Sep 17 00:00:00 2001 From: bunsenstraat Date: Tue, 11 Feb 2025 11:34:10 +0100 Subject: [PATCH 05/13] path --- apps/remix-ide-e2e/src/commands/hidePopupPanel.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/remix-ide-e2e/src/commands/hidePopupPanel.ts b/apps/remix-ide-e2e/src/commands/hidePopupPanel.ts index d980bdf815..da9fa72836 100644 --- a/apps/remix-ide-e2e/src/commands/hidePopupPanel.ts +++ b/apps/remix-ide-e2e/src/commands/hidePopupPanel.ts @@ -11,7 +11,7 @@ class HidePopupPanel extends EventEmitter { if (!result.value) { browser. - saveScreenshot('/reports/screenshots/hidePopupPanel.png') + saveScreenshot('./reports/screenshots/hidePopupPanel.png') .waitForElementVisible('*[data-id="popupPanelToggle"]') .click('*[data-id="popupPanelToggle"]') } From 16b630eccb36303593a998efd10047539eab1853 Mon Sep 17 00:00:00 2001 From: bunsenstraat Date: Tue, 11 Feb 2025 11:48:05 +0100 Subject: [PATCH 06/13] update img --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index db340812c3..d777d37e9e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -629,7 +629,7 @@ jobs: remix-ide-browser: docker: - - image: cimg/node:20.17.0-browsers + - image: cimg/node:20.18.3-browsers resource_class: xlarge working_directory: ~/remix-project From fd63d454f0dd89acdced14472728072e4dbbebfb Mon Sep 17 00:00:00 2001 From: bunsenstraat Date: Tue, 11 Feb 2025 14:50:39 +0100 Subject: [PATCH 07/13] switch hide --- apps/remix-ide-e2e/src/helpers/init.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/remix-ide-e2e/src/helpers/init.ts b/apps/remix-ide-e2e/src/helpers/init.ts index 9b8351f06b..0caeb6f37e 100644 --- a/apps/remix-ide-e2e/src/helpers/init.ts +++ b/apps/remix-ide-e2e/src/helpers/init.ts @@ -14,7 +14,7 @@ export default function (browser: NightwatchBrowser, callback: VoidFunction, url .url(url || 'http://127.0.0.1:8080') .pause(5000) .switchBrowserTab(0) - .hidePopupPanel() + //.hidePopupPanel() .perform((done) => { if (!loadPlugin) return done() browser From 0416551ee6541e2f0053994e93b6c13c411d4b94 Mon Sep 17 00:00:00 2001 From: bunsenstraat Date: Tue, 11 Feb 2025 15:02:39 +0100 Subject: [PATCH 08/13] img --- .circleci/config.yml | 2 +- apps/remix-ide-e2e/src/helpers/init.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d777d37e9e..bed03ad442 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -629,7 +629,7 @@ jobs: remix-ide-browser: docker: - - image: cimg/node:20.18.3-browsers + - image: cimg/node:23.7.0-browsers resource_class: xlarge working_directory: ~/remix-project diff --git a/apps/remix-ide-e2e/src/helpers/init.ts b/apps/remix-ide-e2e/src/helpers/init.ts index 0caeb6f37e..9b8351f06b 100644 --- a/apps/remix-ide-e2e/src/helpers/init.ts +++ b/apps/remix-ide-e2e/src/helpers/init.ts @@ -14,7 +14,7 @@ export default function (browser: NightwatchBrowser, callback: VoidFunction, url .url(url || 'http://127.0.0.1:8080') .pause(5000) .switchBrowserTab(0) - //.hidePopupPanel() + .hidePopupPanel() .perform((done) => { if (!loadPlugin) return done() browser From 1d1e2e1f3f9f0714f610181824a80f79f5c74ad4 Mon Sep 17 00:00:00 2001 From: bunsenstraat Date: Tue, 11 Feb 2025 15:17:06 +0100 Subject: [PATCH 09/13] switch window --- .circleci/config.yml | 2 +- apps/remix-ide-e2e/src/helpers/init.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index bed03ad442..d777d37e9e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -629,7 +629,7 @@ jobs: remix-ide-browser: docker: - - image: cimg/node:23.7.0-browsers + - image: cimg/node:20.18.3-browsers resource_class: xlarge working_directory: ~/remix-project diff --git a/apps/remix-ide-e2e/src/helpers/init.ts b/apps/remix-ide-e2e/src/helpers/init.ts index 9b8351f06b..fc5f6f2e4d 100644 --- a/apps/remix-ide-e2e/src/helpers/init.ts +++ b/apps/remix-ide-e2e/src/helpers/init.ts @@ -13,7 +13,7 @@ export default function (browser: NightwatchBrowser, callback: VoidFunction, url browser .url(url || 'http://127.0.0.1:8080') .pause(5000) - .switchBrowserTab(0) + .switchBrowserTab(1) .hidePopupPanel() .perform((done) => { if (!loadPlugin) return done() From 68989fbea16e40fcc60a09ed5cdcebbc8fe8207c Mon Sep 17 00:00:00 2001 From: bunsenstraat Date: Tue, 11 Feb 2025 15:36:37 +0100 Subject: [PATCH 10/13] fix cmd --- apps/remix-ide-e2e/src/commands/switchBrowserTab.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/apps/remix-ide-e2e/src/commands/switchBrowserTab.ts b/apps/remix-ide-e2e/src/commands/switchBrowserTab.ts index 76db38f0aa..f203e8f725 100644 --- a/apps/remix-ide-e2e/src/commands/switchBrowserTab.ts +++ b/apps/remix-ide-e2e/src/commands/switchBrowserTab.ts @@ -6,11 +6,13 @@ import EventEmitter from 'events' */ class SwitchBrowserTab extends EventEmitter { - command (this: NightwatchBrowser, index: number): NightwatchBrowser { + command(this: NightwatchBrowser, index: number): NightwatchBrowser { this.api.perform((browser: NightwatchAPI, done) => { browser.windowHandles((result) => { console.log('switching to window', result) - browser.switchWindow(result.value[index]) + if (Array.isArray(result.value)) { + browser.switchWindow(result.value[result.value[index] ? index : 0]) + } done() }) this.emit('complete') From b4352e32fe96f15f20bff8aa6abfb974ada8e71c Mon Sep 17 00:00:00 2001 From: bunsenstraat Date: Tue, 11 Feb 2025 15:37:42 +0100 Subject: [PATCH 11/13] fix cmd --- apps/remix-ide-e2e/src/commands/switchBrowserTab.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/remix-ide-e2e/src/commands/switchBrowserTab.ts b/apps/remix-ide-e2e/src/commands/switchBrowserTab.ts index f203e8f725..03d5838d30 100644 --- a/apps/remix-ide-e2e/src/commands/switchBrowserTab.ts +++ b/apps/remix-ide-e2e/src/commands/switchBrowserTab.ts @@ -11,7 +11,7 @@ class SwitchBrowserTab extends EventEmitter { browser.windowHandles((result) => { console.log('switching to window', result) if (Array.isArray(result.value)) { - browser.switchWindow(result.value[result.value[index] ? index : 0]) + browser.switchWindow(result.value[index] || result.value[0]) } done() }) From e87c4c2dbad69a0ec3d93a2ea4cc037292f2c9e5 Mon Sep 17 00:00:00 2001 From: bunsenstraat Date: Tue, 11 Feb 2025 16:07:48 +0100 Subject: [PATCH 12/13] try chrome exception --- apps/remix-ide-e2e/src/commands/switchBrowserTab.ts | 4 ++++ apps/remix-ide-e2e/src/helpers/init.ts | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/apps/remix-ide-e2e/src/commands/switchBrowserTab.ts b/apps/remix-ide-e2e/src/commands/switchBrowserTab.ts index 03d5838d30..ef880418a1 100644 --- a/apps/remix-ide-e2e/src/commands/switchBrowserTab.ts +++ b/apps/remix-ide-e2e/src/commands/switchBrowserTab.ts @@ -8,9 +8,13 @@ import EventEmitter from 'events' class SwitchBrowserTab extends EventEmitter { command(this: NightwatchBrowser, index: number): NightwatchBrowser { this.api.perform((browser: NightwatchAPI, done) => { + const runtimeBrowser = browser.options.desiredCapabilities.browserName browser.windowHandles((result) => { console.log('switching to window', result) if (Array.isArray(result.value)) { + if(runtimeBrowser === 'chrome') { + index = index + 1 + } browser.switchWindow(result.value[index] || result.value[0]) } done() diff --git a/apps/remix-ide-e2e/src/helpers/init.ts b/apps/remix-ide-e2e/src/helpers/init.ts index fc5f6f2e4d..9b8351f06b 100644 --- a/apps/remix-ide-e2e/src/helpers/init.ts +++ b/apps/remix-ide-e2e/src/helpers/init.ts @@ -13,7 +13,7 @@ export default function (browser: NightwatchBrowser, callback: VoidFunction, url browser .url(url || 'http://127.0.0.1:8080') .pause(5000) - .switchBrowserTab(1) + .switchBrowserTab(0) .hidePopupPanel() .perform((done) => { if (!loadPlugin) return done() From 3e9037cc593849edceb2e57a2e2e5c96cbaffa4d Mon Sep 17 00:00:00 2001 From: bunsenstraat Date: Tue, 11 Feb 2025 16:24:05 +0100 Subject: [PATCH 13/13] revert cmd --- apps/remix-ide-e2e/src/commands/hidePopupPanel.ts | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/apps/remix-ide-e2e/src/commands/hidePopupPanel.ts b/apps/remix-ide-e2e/src/commands/hidePopupPanel.ts index da9fa72836..dd646722a5 100644 --- a/apps/remix-ide-e2e/src/commands/hidePopupPanel.ts +++ b/apps/remix-ide-e2e/src/commands/hidePopupPanel.ts @@ -9,10 +9,7 @@ class HidePopupPanel extends EventEmitter { return localStorage.getItem('did_show_popup_panel') }, [], function (result) { if (!result.value) { - - browser. - saveScreenshot('./reports/screenshots/hidePopupPanel.png') - .waitForElementVisible('*[data-id="popupPanelToggle"]') + browser.waitForElementVisible('*[data-id="popupPanelToggle"]') .click('*[data-id="popupPanelToggle"]') } done()