From d85b117403704dc6f99c6e174cf7e972b68bb68e Mon Sep 17 00:00:00 2001 From: filip mertens Date: Sun, 18 Sep 2022 16:08:09 +0200 Subject: [PATCH] init --- .../src/commands/setSolidityCompilerVersion.ts | 11 ++--------- apps/remix-ide-e2e/src/helpers/init.ts | 8 ++++---- .../solidity-compiler/src/lib/compiler-container.tsx | 1 - 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/apps/remix-ide-e2e/src/commands/setSolidityCompilerVersion.ts b/apps/remix-ide-e2e/src/commands/setSolidityCompilerVersion.ts index 7a6448627d..1000ed6458 100644 --- a/apps/remix-ide-e2e/src/commands/setSolidityCompilerVersion.ts +++ b/apps/remix-ide-e2e/src/commands/setSolidityCompilerVersion.ts @@ -13,18 +13,11 @@ class SetSolidityCompilerVersion extends EventEmitter { locateStrategy: 'xpath' }) .click(`#compileTabView #versionSelector [value="${version}"]`) - .saveScreenshot(`./reports/screenshots/${version}_1.png`) - .pause(5000) - .captureBrowserConsoleLogs((logs) => { - console.log('COMPILER LOGS', logs) - }) - .isPresent({ + .waitForElementPresent({ selector: `//span[@data-version='${version}']`, locateStrategy: 'xpath', - }, (result) => { - console.log('VERSION PRESENT', result) + timeout: 60000 }) - .saveScreenshot(`./reports/screenshots/${version}.png`) .perform(() => { this.emit('complete') }) diff --git a/apps/remix-ide-e2e/src/helpers/init.ts b/apps/remix-ide-e2e/src/helpers/init.ts index b644071acd..99f3598852 100644 --- a/apps/remix-ide-e2e/src/helpers/init.ts +++ b/apps/remix-ide-e2e/src/helpers/init.ts @@ -33,13 +33,13 @@ export default function (browser: NightwatchBrowser, callback: VoidFunction, url .clickLaunchIcon('solidity') .waitForElementVisible('[for="autoCompile"]') .click('[for="autoCompile"]') - .verify.elementPresent('[data-id="compilerContainerAutoCompile"]:checked') + .verify.elementPresent('[data-id="compilerContainerAutoCompile"]:checked').perform(() => { callback() }) }) + + }else{ + callback() } }) - .perform(() => { - callback() - }) } function initModules (browser: NightwatchBrowser, callback: VoidFunction) { diff --git a/libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx b/libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx index 5680180c7c..5c9d67a0af 100644 --- a/libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx +++ b/libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx @@ -849,7 +849,6 @@ export const CompilerContainer = (props: CompilerContainerProps) => {
-
{compilerLoadedVersion}