diff --git a/apps/remix-ide-e2e/src/tests/solidityUnittests.spec.ts b/apps/remix-ide-e2e/src/tests/solidityUnittests.spec.ts index da595937a8..f37d67844d 100644 --- a/apps/remix-ide-e2e/src/tests/solidityUnittests.spec.ts +++ b/apps/remix-ide-e2e/src/tests/solidityUnittests.spec.ts @@ -166,42 +166,42 @@ module.exports = { .verify.attributeEquals('*[data-id="uiPathInput"]', 'value', 'tests') }, - 'Solidity Unit tests Basic Basic with local compiler': function (browser: NightwatchBrowser) { + 'Solidity Unit tests Basic': function (browser: NightwatchBrowser) { browser - .clickLaunchIcon('solidity') - .setSolidityCompilerVersion('builtin') + .waitForElementPresent('*[data-id="verticalIconsKindfilePanel"]') + .clickLaunchIcon('filePanel') + .click('*[data-id="treeViewLitreeViewItemcontracts"]') .openFile('contracts/3_Ballot.sol') - .clickLaunchIcon('pluginManager') - .scrollAndClick('[data-id="pluginManagerComponentDeactivateButtonsolidityUnitTesting"]') - .pause(2000) - .scrollAndClick('[data-id="pluginManagerComponentActivateButtonsolidityUnitTesting"]') - .pause(5000) .clickLaunchIcon('solidityUnitTesting') + .pause(2000) + .verify.attributeEquals('*[data-id="uiPathInput"]', 'value', 'tests') + .pause(2000) .scrollAndClick('#runTestsTabRunAction') .waitForElementVisible('*[data-id="testTabSolidityUnitTestsOutputheader"]', 120000) .waitForElementPresent('#solidityUnittestsOutput div[class^="testPass"]', 60000) .waitForElementContainsText('#solidityUnittestsOutput', '/tests/4_Ballot_test.sol', 60000) .waitForElementContainsText('#solidityUnittestsOutput', '✓ Check winning proposal', 60000) .waitForElementContainsText('#solidityUnittestsOutput', '✓ Check winnin proposal with return value', 60000) - .end() }, - 'Solidity Unit tests Basic': function (browser: NightwatchBrowser) { + 'Solidity Unit tests Basic Basic with local compiler': function (browser: NightwatchBrowser) { browser - .waitForElementPresent('*[data-id="verticalIconsKindfilePanel"]') - .clickLaunchIcon('filePanel') - .click('*[data-id="treeViewLitreeViewItemcontracts"]') + .clickLaunchIcon('solidity') + .setSolidityCompilerVersion('builtin') .openFile('contracts/3_Ballot.sol') - .clickLaunchIcon('solidityUnitTesting') - .pause(2000) - .verify.attributeEquals('*[data-id="uiPathInput"]', 'value', 'tests') + .clickLaunchIcon('pluginManager') + .scrollAndClick('[data-id="pluginManagerComponentDeactivateButtonsolidityUnitTesting"]') .pause(2000) + .scrollAndClick('[data-id="pluginManagerComponentActivateButtonsolidityUnitTesting"]') + .pause(5000) + .clickLaunchIcon('solidityUnitTesting') .scrollAndClick('#runTestsTabRunAction') .waitForElementVisible('*[data-id="testTabSolidityUnitTestsOutputheader"]', 120000) .waitForElementPresent('#solidityUnittestsOutput div[class^="testPass"]', 60000) .waitForElementContainsText('#solidityUnittestsOutput', '/tests/4_Ballot_test.sol', 60000) .waitForElementContainsText('#solidityUnittestsOutput', '✓ Check winning proposal', 60000) .waitForElementContainsText('#solidityUnittestsOutput', '✓ Check winnin proposal with return value', 60000) + .end() } } diff --git a/libs/remix-ui/terminal/src/lib/reducers/remixWelcom.ts b/libs/remix-ui/terminal/src/lib/reducers/remixWelcome.ts similarity index 100% rename from libs/remix-ui/terminal/src/lib/reducers/remixWelcom.ts rename to libs/remix-ui/terminal/src/lib/reducers/remixWelcome.ts diff --git a/libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx b/libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx index f790e0dfce..28e5f847b9 100644 --- a/libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx +++ b/libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx @@ -3,7 +3,7 @@ import { useKeyPress } from './custom-hooks/useKeyPress' // eslint-disable-line import { useWindowResize } from 'beautiful-react-hooks' import { registerCommandAction, registerLogScriptRunnerAction, registerInfoScriptRunnerAction, registerErrorScriptRunnerAction, registerWarnScriptRunnerAction, listenOnNetworkAction, initListeningOnNetwork } from './actions/terminalAction' import { initialState, registerCommandReducer, addCommandHistoryReducer, registerScriptRunnerReducer } from './reducers/terminalReducer' -import { remixWelcome } from './reducers/remixWelcom' // eslint-disable-line +import { remixWelcome } from './reducers/remixWelcome' // eslint-disable-line import { getKeyOf, getValueOf, Objectfilter, matched } from './utils/utils' import {allCommands, allPrograms} from './commands' // eslint-disable-line import { CopyToClipboard } from '@remix-ui/clipboard' // eslint-disable-line