Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions apps/remix-ide-e2e/src/commands/createContract.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ function createContract (browser: NightwatchBrowser, inputParams: string, callba
browser.setValue('.udapp_contractActionsContainerSingle > input', inputParams, function () {
browser
.pause(1000) // wait to get the button enabled
.waitForElementVisible('.udapp_contractActionsContainerSingle button')
.waitForElementVisible('.udapp_contractActionsContainerSingle button', 60000)
.click('.udapp_contractActionsContainerSingle button').pause(500).perform(function () { callback() })
})
} else {
browser
.waitForElementVisible('.udapp_contractActionsContainerSingle button')
.waitForElementVisible('.udapp_contractActionsContainerSingle button', 60000)
.click('.udapp_contractActionsContainerSingle button')
.pause(500)
.perform(function () { callback() })
Expand Down
2 changes: 1 addition & 1 deletion apps/remix-ide-e2e/src/commands/verifyLoad.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import EventEmitter from 'events'

class VerifyLoad extends EventEmitter {
command(this: NightwatchBrowser) {
browser.saveScreenshot('./reports/screenshots/verifyLoad.png').waitForElementPresent({
browser.waitForElementPresent({
selector: "//span[@data-id='typesloaded']",
locateStrategy: 'xpath',
timeout: 60000
Expand Down
2 changes: 1 addition & 1 deletion apps/remix-ide-e2e/src/tests/ai_panel.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ const tests = {
browser
.click('*[data-id="movePluginToLeft"]')
.clickLaunchIcon('filePanel')
.waitForElementNotVisible('*[data-id="remix-ai-assistant"]', 5000)
.waitForElementNotVisible('*[data-id="remix-ai-assistant"]', 60000)
},
}

Expand Down
28 changes: 14 additions & 14 deletions apps/remix-ide-e2e/src/tests/ballot.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ module.exports = {
},
'Deploy Ballot #group1': function (browser: NightwatchBrowser) {
browser
.waitForElementVisible('*[data-id="remixIdeIconPanel"]', 10000)
.waitForElementVisible('*[data-id="remixIdeIconPanel"]', 60000)
.clickLaunchIcon('solidity')
.testContracts('Untitled.sol', sources[0]['Untitled.sol'], ['Ballot'])
.clickLaunchIcon('udapp')
Expand Down Expand Up @@ -55,10 +55,10 @@ module.exports = {
'Debug Ballot / delegate #group1': function (browser: NightwatchBrowser) {
browser.pause(500)
.debugTransaction(1)
.waitForElementVisible('*[data-id="buttonNavigatorJumpPreviousBreakpoint"]')
.waitForElementVisible('*[data-id="buttonNavigatorJumpPreviousBreakpoint"]', 60000)
.click('*[data-id="buttonNavigatorJumpPreviousBreakpoint"]')
.pause(2000)
.waitForElementVisible('#stepdetail')
.waitForElementVisible('#stepdetail', 60000)
.goToVMTraceStep(144)
.pause(2000)
.checkVariableDebug('soliditystate', stateCheck)
Expand Down Expand Up @@ -97,16 +97,16 @@ module.exports = {
.clickLaunchIcon('filePanel')
.click('*[data-id="workspacesSelect"]')
.click('*[data-id="workspacecreate"]')
.waitForElementPresent('*[data-id="create-remixDefault"]')
.waitForElementPresent('*[data-id="create-remixDefault"]', 60000)
.scrollAndClick('*[data-id="create-remixDefault"]')
.waitForElementVisible('*[data-id="modalDialogCustomPromptTextCreate"]')
.waitForElementVisible('*[data-id="modalDialogCustomPromptTextCreate"]', 60000)
.scrollAndClick('*[data-id="modalDialogCustomPromptTextCreate"]')
.setValue('*[data-id="modalDialogCustomPromptTextCreate"]', 'workspace_remix_default')
// eslint-disable-next-line dot-notation
.execute(function () { document.querySelector('*[data-id="modalDialogCustomPromptTextCreate"]')['value'] = 'workspace_remix_default' })
.modalFooterOKClick('TemplatesSelection')
.pause(1000)
.waitForElementVisible('*[data-id="treeViewLitreeViewItemcontracts"]')
.waitForElementVisible('*[data-id="treeViewLitreeViewItemcontracts"]', 60000)
.addFile('contracts/lib/storage/src/Storage.sol', { content: storageContract})
.addFile('remappings.txt', { content: 'storage=contracts/lib/storage/src' })
.addFile('contracts/Retriever.sol', { content: retrieverContract })
Expand Down Expand Up @@ -145,9 +145,9 @@ module.exports = {
browser
.addFile('cf.json', { content: configFile })
.clickLaunchIcon('solidity')
.waitForElementVisible('*[data-id="scConfigExpander"]')
.waitForElementVisible('*[data-id="scConfigExpander"]', 60000)
.click('*[data-id="scConfigExpander"]')
.waitForElementVisible('*[data-id="scFileConfiguration"]', 10000)
.waitForElementVisible('*[data-id="scFileConfiguration"]', 60000)
.click('*[data-id="scFileConfiguration"]')
// the input field behaves badly, it would often not receive the value, so retrying it a few times for now is the best thing to do
.waitForElementVisible({
Expand All @@ -170,7 +170,7 @@ module.exports = {
timeout: 1000
})

.waitForElementVisible('*[data-id="scConfigFilePathInput"]', 10000)
.waitForElementVisible('*[data-id="scConfigFilePathInput"]', 60000)
.sendKeys('*[data-id="scConfigFilePathInput"]', 'cf.json')
.sendKeys('*[data-id="scConfigFilePathInput"]', browser.Keys.ENTER)

Expand Down Expand Up @@ -201,7 +201,7 @@ module.exports = {
timeout: 1000
})

.waitForElementVisible('*[data-id="scConfigFilePathInput"]', 10000)
.waitForElementVisible('*[data-id="scConfigFilePathInput"]', 60000)
.sendKeys('*[data-id="scConfigFilePathInput"]', 'cf.json')
.sendKeys('*[data-id="scConfigFilePathInput"]', browser.Keys.ENTER)
}
Expand Down Expand Up @@ -234,7 +234,7 @@ module.exports = {
timeout: 1000
})

.waitForElementVisible('*[data-id="scConfigFilePathInput"]', 10000)
.waitForElementVisible('*[data-id="scConfigFilePathInput"]', 60000)
.sendKeys('*[data-id="scConfigFilePathInput"]', 'cf.json')
.sendKeys('*[data-id="scConfigFilePathInput"]', browser.Keys.ENTER)
}
Expand All @@ -249,12 +249,12 @@ module.exports = {
browser
.addFile('sample.yul', { content: yulSample })
.clickLaunchIcon('solidity')
.waitForElementVisible('*[data-id="scConfigExpander"]')
.waitForElementVisible('*[data-id="scConfigExpander"]', 60000)
.click('*[data-id="scManualConfiguration"]')
.waitForElementVisible('select[id="compilerLanguageSelector"]', 10000)
.waitForElementVisible('select[id="compilerLanguageSelector"]', 60000)
.click('select[id="compilerLanguageSelector"]')
.click('select[id="compilerLanguageSelector"] option[value=Yul]')
.waitForElementContainsText('[data-id="compiledContracts"]', 'Contract', 65000)
.waitForElementContainsText('[data-id="compiledContracts"]', 'Contract', 60000)
.clickLaunchIcon('udapp')
.click('*[data-id="Deploy - transact (not payable)"]')
.waitForElementPresent('*[data-id="universalDappUiContractActionWrapper"]', 60000)
Expand Down
6 changes: 3 additions & 3 deletions apps/remix-ide-e2e/src/tests/bottom-bar.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@ module.exports = {
const toggleInputSelector = '[data-id="copilot_toggle"]';

browser
.waitForElementVisible('[data-id="remixui_status_bottom_bar"]', 5000)
.waitForElementContainsText(statusTextSelector, 'RemixAI Copilot', 1000)
.waitForElementVisible('[data-id="remixui_status_bottom_bar"]', 60000)
.waitForElementContainsText(statusTextSelector, 'RemixAI Copilot', 60000)
.perform((done) => {
browser.getText(statusTextSelector, (result) => {
const currentStatusText = result.value as string
const isCurrentlyDisabled = currentStatusText.includes('(disabled)')
const expectedStatusAfterToggle = isCurrentlyDisabled ? '(enabled)' : '(disabled)'
browser.click(toggleInputSelector)
.waitForElementContainsText(statusTextSelector, expectedStatusAfterToggle, 10000)
.waitForElementContainsText(statusTextSelector, expectedStatusAfterToggle, 60000)
done()
});
});
Expand Down
4 changes: 2 additions & 2 deletions apps/remix-ide-e2e/src/tests/circom.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ module.exports = {
.waitForElementContainsText('*[data-id="terminalJournal"]', 'Everything went okay')
.waitForElementPresent('[data-id="treeViewLitreeViewItemcircuits/.bin/simple_js"]')
.openFile('circuits/.bin/simple_js')
.waitForElementPresent('[data-id="treeViewLitreeViewItemcircuits/.bin/simple_js/simple.wasm"]')
.waitForElementPresent('[data-id="treeViewLitreeViewItemcircuits/.bin/simple_js/simple.wasm"]', 60000)
},
'Should compute a witness for a simple circuit #group1': function (browser: NightwatchBrowser) {
browser
Expand Down Expand Up @@ -165,7 +165,7 @@ module.exports = {
.click('button[data-id="compile_circuit_btn"]')
.waitForElementPresent('[data-id="circuit_feedback"]')
.assert.hasClass('[data-id="circuit_feedback"]', 'alert-danger')
.waitForElementContainsText('[data-id="circuit_feedback"]', 'No main specified in the project structure')
.waitForElementContainsText('[data-id="circuit_feedback"]', 'No main specified in the project structure', 60000)
},
'Should auto compile circuit #group4': function (browser: NightwatchBrowser) {
browser
Expand Down
24 changes: 12 additions & 12 deletions apps/remix-ide-e2e/src/tests/compile_run_widget.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,44 +16,44 @@ module.exports = {
browser
.openFile('contracts/3_Ballot.sol')
.click('[data-id="compile-action"]')
.waitForElementVisible('[data-id="compile_group"] i.fa-check', 10000)
.waitForElementVisible('[data-id="compile_group"] i.fa-check', 60000)
.verifyContracts(['Ballot'])
},

'Run script using the widget #group2': function (browser: NightwatchBrowser) {
browser
.openFile('scripts/deploy_with_web3.ts')
.click('[data-id="compile-action"]')
.waitForElementVisible('[data-id="compile_group"] i.fa-check', 10000)
.waitForElementVisible('[data-id="compile_group"] i.fa-check', 60000)
},

'Should activate Solidity Static Analysis and show "Solidity Analyzers" title from compile dropdown #group3': function (browser: NightwatchBrowser) {
browser
.openFile('contracts/3_Ballot.sol')
.click('[data-id="compile-dropdown-trigger"]')
.waitForElementVisible('[data-id="compile-dropdown-panel"]', 5000)
.waitForElementVisible('[data-id="compile-dropdown-panel"]', 60000)
.click('[data-id="compile-run-analysis-menu-item"]')
.waitForElementVisible('[data-id="compile-run-analysis-menu-item-panel"]', 5000)
.waitForElementVisible('[data-id="compile-run-analysis-menu-item-panel"]', 60000)
.click('[data-id="run-remix-analysis-submenu-item"]')
.waitForElementVisible('#icon-panel div[plugin="solidityStaticAnalysis"]', 10000)
.waitForElementVisible('[data-id="sidePanelSwapitTitle"]', 5000)
.waitForElementVisible('#icon-panel div[plugin="solidityStaticAnalysis"]', 60000)
.waitForElementVisible('[data-id="sidePanelSwapitTitle"]', 60000)
.assert.textContains('[data-id="sidePanelSwapitTitle"]', 'SOLIDITY ANALYZERS', 'Solidity Analyzers title should be visible.')
.waitForElementVisible('#side-panel', 5000)
.waitForElementVisible('#side-panel', 60000)
.verifyContracts(['Ballot'])
},

'Should run Solidity Scan and display results in terminal #group4': function (browser: NightwatchBrowser) {
browser
.openFile('contracts/3_Ballot.sol')
.click('[data-id="compile-dropdown-trigger"]')
.waitForElementVisible('[data-id="compile-dropdown-panel"]', 5000)
.waitForElementVisible('[data-id="compile-dropdown-panel"]', 60000)
.click('[data-id="compile-run-analysis-menu-item"]')
.waitForElementVisible('[data-id="compile-run-analysis-menu-item-panel"]', 5000)
.waitForElementVisible('[data-id="compile-run-analysis-menu-item-panel"]', 60000)
.click('[data-id="run-solidity-scan-submenu-item"]')
.waitForElementVisible('[data-id="SolidityScanPermissionHandlerModalDialogModalTitle-react"]', 10000)
.waitForElementVisible('[data-id="SolidityScanPermissionHandler-modal-footer-ok-react"]', 5000)
.waitForElementVisible('[data-id="SolidityScanPermissionHandlerModalDialogModalTitle-react"]', 60000)
.waitForElementVisible('[data-id="SolidityScanPermissionHandler-modal-footer-ok-react"]', 60000)
.click('[data-id="SolidityScanPermissionHandler-modal-footer-ok-react"]')
.waitForElementContainsText('*[data-id="terminalJournal"]', 'Scan Summary:', 30000)
.waitForElementContainsText('*[data-id="terminalJournal"]', 'Scan Summary:', 60000)
.verifyContracts(['Ballot'])
}
}
16 changes: 8 additions & 8 deletions apps/remix-ide-e2e/src/tests/debugger.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ module.exports = {
},

'Should jump through breakpoints #group1': function (browser: NightwatchBrowser) {
browser.waitForElementVisible('#editorView')
browser.waitForElementVisible('#editorView', 60000)
.execute(() => {
(window as any).addRemixBreakpoint(11)
}, [], () => { })
Expand All @@ -88,11 +88,11 @@ module.exports = {
.clickLaunchIcon('solidity')
.testContracts('externalImport.sol', sources[1]['externalImport.sol'], ['ERC20'])
.clickLaunchIcon('udapp')
.waitForElementPresent('*[data-bs-title="Deploy - transact (not payable)"]', 35000)
.waitForElementPresent('*[data-bs-title="Deploy - transact (not payable)"]', 60000)
.selectContract('ERC20')
.createContract('"tokenName", "symbol"')
.debugTransaction(0)
.waitForElementVisible('#stepdetail')
.waitForElementVisible('#stepdetail', 60000)
.waitForElementVisible({
locateStrategy: 'xpath',
selector: '//*[@data-id="treeViewLivm trace step" and contains(.,"475")]',
Expand Down Expand Up @@ -131,13 +131,13 @@ module.exports = {
.clickInstance(0)
.clickFunction('test1 - transact (not payable)', { types: 'bytes userData', values: '0x000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000015b38da6a701c568545dcfcb03fcb875f56beddc4' })
.debugTransaction(0)
.waitForElementVisible('#stepdetail')
.waitForElementVisible('#stepdetail', 60000)
.waitForElementVisible({
locateStrategy: 'xpath',
selector: '//*[@data-id="treeViewLivm trace step" and contains(.,"133")]',
})
.goToVMTraceStep(261)
.waitForElementPresent('.highlightLine8')
.waitForElementPresent('.highlightLine8', 60000)
/*
for the test below:
source highlight should remain line `bytes32 idAsk = abi.decode(userData[:33], (bytes32));`
Expand All @@ -159,7 +159,7 @@ module.exports = {
.clickLaunchIcon('solidity')
.testContracts('locals.sol', sources[3]['locals.sol'], ['testLocals'])
.clickLaunchIcon('udapp')
.waitForElementPresent('*[data-bs-title="Deploy - transact (not payable)"]', 40000)
.waitForElementPresent('*[data-bs-title="Deploy - transact (not payable)"]', 60000)
.createContract('')
.pause(2000)
.clearConsole()
Expand Down Expand Up @@ -259,7 +259,7 @@ module.exports = {
.clearValue('*[data-id="modalDialogCustomPromptText"]')
.setValue('*[data-id="modalDialogCustomPromptText"]', 'https://remix-rinkeby.ethdevops.io')
.modalFooterOKClick()
.waitForElementPresent('*[title="Deploy - transact (not payable)"]', 65000) // wait for the compilation to succeed
.waitForElementPresent('*[title="Deploy - transact (not payable)"]', 60000) // wait for the compilation to succeed
.clickLaunchIcon('debugger')
.clearValue('*[data-id="debuggerTransactionInput"]')
.setValue('*[data-id="debuggerTransactionInput"]', '0x156dbf7d0f9b435dd900cfc8f3264d523dd25733418ddbea1ce53e294f421013')
Expand All @@ -285,7 +285,7 @@ module.exports = {
.goToVMTraceStep(80)
.waitForElementVisible('*[data-id="debugGoToRevert"]', 60000)
.click('*[data-id="debugGoToRevert"]')
.waitForElementContainsText('*[data-id="asmitems"] div[selected="selected"]', '114 REVERT')
.waitForElementContainsText('*[data-id="asmitems"] div[selected="selected"]', '114 REVERT', 60000)
}
}

Expand Down
4 changes: 2 additions & 2 deletions apps/remix-ide-e2e/src/tests/defaultLayout.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ module.exports = {
},

'Loads Icon\'s Panel': function (browser: NightwatchBrowser) {
browser.waitForElementVisible('div[data-id="remixIdeIconPanel"]', 10000)
browser.waitForElementVisible('div[data-id="remixIdeIconPanel"]', 60000)
.waitForElementVisible('div[data-id="verticalIconsHomeIcon"]')
.waitForElementVisible('div[plugin="filePanel"]')
.waitForElementVisible('div[plugin="pluginManager"]')
Expand All @@ -34,7 +34,7 @@ module.exports = {

'Loads terminal': function (browser: NightwatchBrowser) {
browser
.waitForElementVisible('div[data-id="terminalCli"]', 10000)
.waitForElementVisible('div[data-id="terminalCli"]', 60000)
.journalLastChildIncludes('Welcome to Remix')
},

Expand Down
8 changes: 2 additions & 6 deletions apps/remix-ide-e2e/src/tests/dgit_local.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -143,9 +143,7 @@ module.exports = {
.click('*[data-id="commits-panel"]')
.waitForElementPresent({
selector: `//*[@data-id="commit-summary-testcommit2-"]`,
locateStrategy: 'xpath',
timeout: 60000
}).pause(2000)
locateStrategy: 'xpath', timeout: 60000 }).pause(2000)
},
'check the log for testcommit2 #group1': async function (browser: NightwatchBrowser) {
const logs = await getGitLog('/tmp/git/bare.git')
Expand Down Expand Up @@ -340,9 +338,7 @@ module.exports = {
})
.waitForElementVisible({
selector: "//*[@data-id='branches-panel-content']//*[@data-id='branches-toggle-current-branch-master']",
locateStrategy: 'xpath',
timeout: 60000
})
locateStrategy: 'xpath', timeout: 60000 })
},
'check if test file is gone #group2': function (browser: NightwatchBrowser) {
browser
Expand Down
Loading