From 3909eb2cf89f98bbe386be66d75bd8d640b970dd Mon Sep 17 00:00:00 2001 From: ioedeveloper Date: Thu, 29 Oct 2020 13:55:48 +0100 Subject: [PATCH] Add hidden element for e2e test assertion --- apps/remix-ide-e2e/src/commands/selectContract.ts | 1 + apps/remix-ide-e2e/src/commands/testContracts.ts | 2 +- apps/remix-ide-e2e/src/tests/ballot.test.ts | 4 ++-- apps/remix-ide-e2e/src/tests/ballot_0_4_11.test.ts | 2 +- libs/remix-ui/debugger-ui/src/lib/debugger-ui.tsx | 2 -- .../debugger-ui/src/lib/vm-debugger/dropdown-panel.tsx | 1 + 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/remix-ide-e2e/src/commands/selectContract.ts b/apps/remix-ide-e2e/src/commands/selectContract.ts index b228ef85f6..8b5a033e76 100644 --- a/apps/remix-ide-e2e/src/commands/selectContract.ts +++ b/apps/remix-ide-e2e/src/commands/selectContract.ts @@ -16,6 +16,7 @@ class SelectContract extends EventEmitter { function selectContract (browser: NightwatchBrowser, contractName: string, callback: VoidFunction) { browser.clickLaunchIcon('settings').clickLaunchIcon('udapp') .setValue('#runTabView select[class^="contractNames"]', contractName).perform(() => { + console.log('Done!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!') callback() }) } diff --git a/apps/remix-ide-e2e/src/commands/testContracts.ts b/apps/remix-ide-e2e/src/commands/testContracts.ts index 7b7192348e..0e3de8a7da 100644 --- a/apps/remix-ide-e2e/src/commands/testContracts.ts +++ b/apps/remix-ide-e2e/src/commands/testContracts.ts @@ -17,7 +17,7 @@ function testContracts (browser: NightwatchBrowser, fileName: string, contractCo browser .clickLaunchIcon('solidity') .addFile(fileName, contractCode) - .pause(1000) + .pause(25000) .verifyContracts(compiledContractNames) .perform(() => { callback() diff --git a/apps/remix-ide-e2e/src/tests/ballot.test.ts b/apps/remix-ide-e2e/src/tests/ballot.test.ts index 7678da1660..692eb1bf4d 100644 --- a/apps/remix-ide-e2e/src/tests/ballot.test.ts +++ b/apps/remix-ide-e2e/src/tests/ballot.test.ts @@ -45,8 +45,8 @@ module.exports = { .pause(2000) .goToVMTraceStep(79) .pause(1000) - // .checkVariableDebug('soliditystate', stateCheck) - // .checkVariableDebug('soliditylocals', localsCheck) + .checkVariableDebug('soliditystate', stateCheck) + .checkVariableDebug('soliditylocals', localsCheck) }, 'Access Ballot via at address': function (browser: NightwatchBrowser) { diff --git a/apps/remix-ide-e2e/src/tests/ballot_0_4_11.test.ts b/apps/remix-ide-e2e/src/tests/ballot_0_4_11.test.ts index d6398cc3e2..17f83c4778 100644 --- a/apps/remix-ide-e2e/src/tests/ballot_0_4_11.test.ts +++ b/apps/remix-ide-e2e/src/tests/ballot_0_4_11.test.ts @@ -54,7 +54,7 @@ module.exports = { .pause(2000) .goToVMTraceStep(20) .pause(1000) - // .checkVariableDebug('callstackpanel', ["0x692a70D2e424a56D2C6C27aA97D1a86395877b3A"]) + .checkVariableDebug('callstackpanel', ["0x692a70D2e424a56D2C6C27aA97D1a86395877b3A"]) }, 'Access Ballot via at address': function (browser: NightwatchBrowser) { diff --git a/libs/remix-ui/debugger-ui/src/lib/debugger-ui.tsx b/libs/remix-ui/debugger-ui/src/lib/debugger-ui.tsx index c0d5e1e667..b499fc2b89 100644 --- a/libs/remix-ui/debugger-ui/src/lib/debugger-ui.tsx +++ b/libs/remix-ui/debugger-ui/src/lib/debugger-ui.tsx @@ -51,9 +51,7 @@ export const DebuggerUI = ({ debuggerModule }) => { }) editor.event.register('breakpointAdded', (fileName, row) => { - console.log('breakpoint triggerred!') if (state.debugger) { - console.log('breakpoint added!') state.debugger.breakPointManager.add({fileName: fileName, row: row}) } }) diff --git a/libs/remix-ui/debugger-ui/src/lib/vm-debugger/dropdown-panel.tsx b/libs/remix-ui/debugger-ui/src/lib/vm-debugger/dropdown-panel.tsx index c95c9a1ebe..eb16f674e0 100644 --- a/libs/remix-ui/debugger-ui/src/lib/vm-debugger/dropdown-panel.tsx +++ b/libs/remix-ui/debugger-ui/src/lib/vm-debugger/dropdown-panel.tsx @@ -201,6 +201,7 @@ export const DropdownPanel = (props: DropdownPanelProps) => { } +
{ state.message.innerText }