From cedb350e44f827e74a53e0901d7c01e3a7e7b9c6 Mon Sep 17 00:00:00 2001 From: Joseph Izang Date: Tue, 24 Oct 2023 17:42:59 +0100 Subject: [PATCH] fix e2e --- apps/remix-ide-e2e/src/commands/verifyContracts.ts | 14 +++++++++----- apps/remix-ide/src/app/plugins/compile-details.tsx | 4 ++-- libs/remix-ui/tabs/src/lib/remix-ui-tabs.tsx | 1 + 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/apps/remix-ide-e2e/src/commands/verifyContracts.ts b/apps/remix-ide-e2e/src/commands/verifyContracts.ts index f1f02498f8..5aad6d7c34 100644 --- a/apps/remix-ide-e2e/src/commands/verifyContracts.ts +++ b/apps/remix-ide-e2e/src/commands/verifyContracts.ts @@ -30,8 +30,10 @@ function verifyContracts (browser: NightwatchBrowser, compiledContractNames: str .pause(2000) .click('*[data-id="treeViewDivtreeViewItemcompiler"]') .waitForElementVisible('*[data-id="treeViewLiversion"]') - .assert.containsText('*[data-id="treeViewLiversion"]', `${opts.version}`) - .assert.visible('*[id="compileDetails"]') + .waitForElementContainsText('*[data-id="treeViewLiversion"]', `${opts.version}`) + .waitForElementVisible('*[id="compileDetails"]') + .waitForElementVisible('*[data-path="compilationDetails"]') + .click('*[data-id="close_compilationDetails"]') .perform(() => { done() callback() @@ -42,14 +44,16 @@ function verifyContracts (browser: NightwatchBrowser, compiledContractNames: str .waitForElementVisible('*[data-id="remixui_treeviewitem_metadata"]') .pause(2000) .click('*[data-id="remixui_treeviewitem_metadata"]') - .waitForElementVisible('*[data-id="treeViewDivtreeViewItemsettings"]') + .assert.visible('*[data-id="treeViewDivtreeViewItemsettings"]') .pause(2000) .click('*[data-id="treeViewDivtreeViewItemsettings"]') .waitForElementVisible('*[data-id="treeViewDivtreeViewItemoptimizer"]') .click('*[data-id="treeViewDivtreeViewItemoptimizer"]') .waitForElementVisible('*[data-id="treeViewDivruns"]') - .assert.containsText('*[data-id="treeViewDivruns"]', `${opts.runs}`) - .assert.visible('*[id="compileDetails"]') + .waitForElementContainsText('*[data-id="treeViewDivruns"]', `${opts.runs}`) + .waitForElementVisible('*[id="compileDetails"]') + .waitForElementVisible('*[data-id="close_compilationDetails"]') + .click('*[data-id="close_compilationDetails"]') .perform(() => { done() callback() diff --git a/apps/remix-ide/src/app/plugins/compile-details.tsx b/apps/remix-ide/src/app/plugins/compile-details.tsx index 74a2e8bfc0..1a19c22cbc 100644 --- a/apps/remix-ide/src/app/plugins/compile-details.tsx +++ b/apps/remix-ide/src/app/plugins/compile-details.tsx @@ -35,7 +35,7 @@ export class CompilationDetailsPlugin extends ViewPlugin { } async onActivation() { - await this.call('tabs', 'focus', 'compilationdetails') + await this.call('tabs', 'focus', 'compilationDetails') this.renderComponent() _paq.push(['trackEvent', 'plugin', 'activated', 'compilationDetails']) } @@ -45,7 +45,7 @@ export class CompilationDetailsPlugin extends ViewPlugin { } async showDetails(sentPayload: any) { - await this.call('tabs', 'focus', 'compilationdetails') + await this.call('tabs', 'focus', 'compilationDetails') this.payload = sentPayload this.renderComponent() } diff --git a/libs/remix-ui/tabs/src/lib/remix-ui-tabs.tsx b/libs/remix-ui/tabs/src/lib/remix-ui-tabs.tsx index 1e2b9684f7..a5055f794b 100644 --- a/libs/remix-ui/tabs/src/lib/remix-ui-tabs.tsx +++ b/libs/remix-ui/tabs/src/lib/remix-ui-tabs.tsx @@ -106,6 +106,7 @@ export const TabsUI = (props: TabsUIProps) => { {getFileDecorationIcons(tab)} { props.onClose(index) event.stopPropagation()