Skip to content

Commit b24bfda

Browse files
author
ci-bot
committed
update waitforelement e2e
1 parent 8c632ba commit b24bfda

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+471
-500
lines changed

‎apps/remix-ide-e2e/src/commands/createContract.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ function createContract (browser: NightwatchBrowser, inputParams: string, callba
1818
browser.setValue('.udapp_contractActionsContainerSingle > input', inputParams, function () {
1919
browser
2020
.pause(1000) // wait to get the button enabled
21-
.waitForElementVisible('.udapp_contractActionsContainerSingle button')
21+
.waitForElementVisible('.udapp_contractActionsContainerSingle button', 60000)
2222
.click('.udapp_contractActionsContainerSingle button').pause(500).perform(function () { callback() })
2323
})
2424
} else {
2525
browser
26-
.waitForElementVisible('.udapp_contractActionsContainerSingle button')
26+
.waitForElementVisible('.udapp_contractActionsContainerSingle button', 60000)
2727
.click('.udapp_contractActionsContainerSingle button')
2828
.pause(500)
2929
.perform(function () { callback() })

‎apps/remix-ide-e2e/src/tests/ai_panel.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ const tests = {
235235
browser
236236
.click('*[data-id="movePluginToLeft"]')
237237
.clickLaunchIcon('filePanel')
238-
.waitForElementNotVisible('*[data-id="remix-ai-assistant"]', 5000)
238+
.waitForElementNotVisible('*[data-id="remix-ai-assistant"]', 60000)
239239
},
240240
}
241241

‎apps/remix-ide-e2e/src/tests/ballot.test.ts‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ module.exports = {
2222
},
2323
'Deploy Ballot #group1': function (browser: NightwatchBrowser) {
2424
browser
25-
.waitForElementVisible('*[data-id="remixIdeIconPanel"]', 10000)
25+
.waitForElementVisible('*[data-id="remixIdeIconPanel"]', 60000)
2626
.clickLaunchIcon('solidity')
2727
.testContracts('Untitled.sol', sources[0]['Untitled.sol'], ['Ballot'])
2828
.clickLaunchIcon('udapp')
@@ -55,10 +55,10 @@ module.exports = {
5555
'Debug Ballot / delegate #group1': function (browser: NightwatchBrowser) {
5656
browser.pause(500)
5757
.debugTransaction(1)
58-
.waitForElementVisible('*[data-id="buttonNavigatorJumpPreviousBreakpoint"]')
58+
.waitForElementVisible('*[data-id="buttonNavigatorJumpPreviousBreakpoint"]', 60000)
5959
.click('*[data-id="buttonNavigatorJumpPreviousBreakpoint"]')
6060
.pause(2000)
61-
.waitForElementVisible('#stepdetail')
61+
.waitForElementVisible('#stepdetail', 60000)
6262
.goToVMTraceStep(144)
6363
.pause(2000)
6464
.checkVariableDebug('soliditystate', stateCheck)
@@ -97,16 +97,16 @@ module.exports = {
9797
.clickLaunchIcon('filePanel')
9898
.click('*[data-id="workspacesSelect"]')
9999
.click('*[data-id="workspacecreate"]')
100-
.waitForElementPresent('*[data-id="create-remixDefault"]')
100+
.waitForElementPresent('*[data-id="create-remixDefault"]', 60000)
101101
.scrollAndClick('*[data-id="create-remixDefault"]')
102-
.waitForElementVisible('*[data-id="modalDialogCustomPromptTextCreate"]')
102+
.waitForElementVisible('*[data-id="modalDialogCustomPromptTextCreate"]', 60000)
103103
.scrollAndClick('*[data-id="modalDialogCustomPromptTextCreate"]')
104104
.setValue('*[data-id="modalDialogCustomPromptTextCreate"]', 'workspace_remix_default')
105105
// eslint-disable-next-line dot-notation
106106
.execute(function () { document.querySelector('*[data-id="modalDialogCustomPromptTextCreate"]')['value'] = 'workspace_remix_default' })
107107
.modalFooterOKClick('TemplatesSelection')
108108
.pause(1000)
109-
.waitForElementVisible('*[data-id="treeViewLitreeViewItemcontracts"]')
109+
.waitForElementVisible('*[data-id="treeViewLitreeViewItemcontracts"]', 60000)
110110
.addFile('contracts/lib/storage/src/Storage.sol', { content: storageContract})
111111
.addFile('remappings.txt', { content: 'storage=contracts/lib/storage/src' })
112112
.addFile('contracts/Retriever.sol', { content: retrieverContract })
@@ -145,9 +145,9 @@ module.exports = {
145145
browser
146146
.addFile('cf.json', { content: configFile })
147147
.clickLaunchIcon('solidity')
148-
.waitForElementVisible('*[data-id="scConfigExpander"]')
148+
.waitForElementVisible('*[data-id="scConfigExpander"]', 60000)
149149
.click('*[data-id="scConfigExpander"]')
150-
.waitForElementVisible('*[data-id="scFileConfiguration"]', 10000)
150+
.waitForElementVisible('*[data-id="scFileConfiguration"]', 60000)
151151
.click('*[data-id="scFileConfiguration"]')
152152
// 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
153153
.waitForElementVisible({
@@ -170,7 +170,7 @@ module.exports = {
170170
timeout: 1000
171171
})
172172

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

@@ -201,7 +201,7 @@ module.exports = {
201201
timeout: 1000
202202
})
203203

204-
.waitForElementVisible('*[data-id="scConfigFilePathInput"]', 10000)
204+
.waitForElementVisible('*[data-id="scConfigFilePathInput"]', 60000)
205205
.sendKeys('*[data-id="scConfigFilePathInput"]', 'cf.json')
206206
.sendKeys('*[data-id="scConfigFilePathInput"]', browser.Keys.ENTER)
207207
}
@@ -234,7 +234,7 @@ module.exports = {
234234
timeout: 1000
235235
})
236236

237-
.waitForElementVisible('*[data-id="scConfigFilePathInput"]', 10000)
237+
.waitForElementVisible('*[data-id="scConfigFilePathInput"]', 60000)
238238
.sendKeys('*[data-id="scConfigFilePathInput"]', 'cf.json')
239239
.sendKeys('*[data-id="scConfigFilePathInput"]', browser.Keys.ENTER)
240240
}
@@ -249,12 +249,12 @@ module.exports = {
249249
browser
250250
.addFile('sample.yul', { content: yulSample })
251251
.clickLaunchIcon('solidity')
252-
.waitForElementVisible('*[data-id="scConfigExpander"]')
252+
.waitForElementVisible('*[data-id="scConfigExpander"]', 60000)
253253
.click('*[data-id="scManualConfiguration"]')
254-
.waitForElementVisible('select[id="compilerLanguageSelector"]', 10000)
254+
.waitForElementVisible('select[id="compilerLanguageSelector"]', 60000)
255255
.click('select[id="compilerLanguageSelector"]')
256256
.click('select[id="compilerLanguageSelector"] option[value=Yul]')
257-
.waitForElementContainsText('[data-id="compiledContracts"]', 'Contract', 65000)
257+
.waitForElementContainsText('[data-id="compiledContracts"]', 'Contract', 60000)
258258
.clickLaunchIcon('udapp')
259259
.click('*[data-id="Deploy - transact (not payable)"]')
260260
.waitForElementPresent('*[data-id="universalDappUiContractActionWrapper"]', 60000)

‎apps/remix-ide-e2e/src/tests/bottom-bar.test.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ module.exports = {
1717
const toggleInputSelector = '[data-id="copilot_toggle"]';
1818

1919
browser
20-
.waitForElementVisible('[data-id="remixui_status_bottom_bar"]', 5000)
21-
.waitForElementContainsText(statusTextSelector, 'RemixAI Copilot', 1000)
20+
.waitForElementVisible('[data-id="remixui_status_bottom_bar"]', 60000)
21+
.waitForElementContainsText(statusTextSelector, 'RemixAI Copilot', 60000)
2222
.perform((done) => {
2323
browser.getText(statusTextSelector, (result) => {
2424
const currentStatusText = result.value as string
2525
const isCurrentlyDisabled = currentStatusText.includes('(disabled)')
2626
const expectedStatusAfterToggle = isCurrentlyDisabled ? '(enabled)' : '(disabled)'
2727
browser.click(toggleInputSelector)
28-
.waitForElementContainsText(statusTextSelector, expectedStatusAfterToggle, 10000)
28+
.waitForElementContainsText(statusTextSelector, expectedStatusAfterToggle, 60000)
2929
done()
3030
});
3131
});

‎apps/remix-ide-e2e/src/tests/circom.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ module.exports = {
4141
.waitForElementContainsText('*[data-id="terminalJournal"]', 'Everything went okay')
4242
.waitForElementPresent('[data-id="treeViewLitreeViewItemcircuits/.bin/simple_js"]')
4343
.openFile('circuits/.bin/simple_js')
44-
.waitForElementPresent('[data-id="treeViewLitreeViewItemcircuits/.bin/simple_js/simple.wasm"]')
44+
.waitForElementPresent('[data-id="treeViewLitreeViewItemcircuits/.bin/simple_js/simple.wasm"]', 60000)
4545
},
4646
'Should compute a witness for a simple circuit #group1': function (browser: NightwatchBrowser) {
4747
browser
@@ -165,7 +165,7 @@ module.exports = {
165165
.click('button[data-id="compile_circuit_btn"]')
166166
.waitForElementPresent('[data-id="circuit_feedback"]')
167167
.assert.hasClass('[data-id="circuit_feedback"]', 'alert-danger')
168-
.waitForElementContainsText('[data-id="circuit_feedback"]', 'No main specified in the project structure')
168+
.waitForElementContainsText('[data-id="circuit_feedback"]', 'No main specified in the project structure', 60000)
169169
},
170170
'Should auto compile circuit #group4': function (browser: NightwatchBrowser) {
171171
browser

‎apps/remix-ide-e2e/src/tests/compile_run_widget.test.ts‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,44 +16,44 @@ module.exports = {
1616
browser
1717
.openFile('contracts/3_Ballot.sol')
1818
.click('[data-id="compile-action"]')
19-
.waitForElementVisible('[data-id="compile_group"] i.fa-check', 10000)
19+
.waitForElementVisible('[data-id="compile_group"] i.fa-check', 60000)
2020
.verifyContracts(['Ballot'])
2121
},
2222

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

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

4545
'Should run Solidity Scan and display results in terminal #group4': function (browser: NightwatchBrowser) {
4646
browser
4747
.openFile('contracts/3_Ballot.sol')
4848
.click('[data-id="compile-dropdown-trigger"]')
49-
.waitForElementVisible('[data-id="compile-dropdown-panel"]', 5000)
49+
.waitForElementVisible('[data-id="compile-dropdown-panel"]', 60000)
5050
.click('[data-id="compile-run-analysis-menu-item"]')
51-
.waitForElementVisible('[data-id="compile-run-analysis-menu-item-panel"]', 5000)
51+
.waitForElementVisible('[data-id="compile-run-analysis-menu-item-panel"]', 60000)
5252
.click('[data-id="run-solidity-scan-submenu-item"]')
53-
.waitForElementVisible('[data-id="SolidityScanPermissionHandlerModalDialogModalTitle-react"]', 10000)
54-
.waitForElementVisible('[data-id="SolidityScanPermissionHandler-modal-footer-ok-react"]', 5000)
53+
.waitForElementVisible('[data-id="SolidityScanPermissionHandlerModalDialogModalTitle-react"]', 60000)
54+
.waitForElementVisible('[data-id="SolidityScanPermissionHandler-modal-footer-ok-react"]', 60000)
5555
.click('[data-id="SolidityScanPermissionHandler-modal-footer-ok-react"]')
56-
.waitForElementContainsText('*[data-id="terminalJournal"]', 'Scan Summary:', 30000)
56+
.waitForElementContainsText('*[data-id="terminalJournal"]', 'Scan Summary:', 60000)
5757
.verifyContracts(['Ballot'])
5858
}
5959
}

‎apps/remix-ide-e2e/src/tests/compiler_api.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ module.exports = {
5656
.setSolidityCompilerVersion('soljson-v0.8.1+commit.df193b15.js')
5757
.addFile('ContractStackLimit.sol', { content: contractStackLimit })
5858
.clickLaunchIcon('solidity')
59-
.waitForElementContainsText('*[data-id="compiledErrors"]', 'CompilerError: Stack too deep when compiling inline assembly: Variable headStart is 1 slot(s) too deep inside the stack.', 60000)
59+
.waitForElementContainsText('*[data-id="compiledErrors"]', 'CompilerError: Stack too deep when compiling inline assembly: Variable headStart is 1 slot(s, 60000) too deep inside the stack.', 60000)
6060
.end()
6161
}
6262
}

‎apps/remix-ide-e2e/src/tests/debugger.test.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ module.exports = {
6363
},
6464

6565
'Should jump through breakpoints #group1': function (browser: NightwatchBrowser) {
66-
browser.waitForElementVisible('#editorView')
66+
browser.waitForElementVisible('#editorView', 60000)
6767
.execute(() => {
6868
(window as any).addRemixBreakpoint(11)
6969
}, [], () => { })
@@ -88,11 +88,11 @@ module.exports = {
8888
.clickLaunchIcon('solidity')
8989
.testContracts('externalImport.sol', sources[1]['externalImport.sol'], ['ERC20'])
9090
.clickLaunchIcon('udapp')
91-
.waitForElementPresent('*[data-bs-title="Deploy - transact (not payable)"]', 35000)
91+
.waitForElementPresent('*[data-bs-title="Deploy - transact (not payable)"]', 60000)
9292
.selectContract('ERC20')
9393
.createContract('"tokenName", "symbol"')
9494
.debugTransaction(0)
95-
.waitForElementVisible('#stepdetail')
95+
.waitForElementVisible('#stepdetail', 60000)
9696
.waitForElementVisible({
9797
locateStrategy: 'xpath',
9898
selector: '//*[@data-id="treeViewLivm trace step" and contains(.,"475")]',
@@ -131,13 +131,13 @@ module.exports = {
131131
.clickInstance(0)
132132
.clickFunction('test1 - transact (not payable)', { types: 'bytes userData', values: '0x000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000015b38da6a701c568545dcfcb03fcb875f56beddc4' })
133133
.debugTransaction(0)
134-
.waitForElementVisible('#stepdetail')
134+
.waitForElementVisible('#stepdetail', 60000)
135135
.waitForElementVisible({
136136
locateStrategy: 'xpath',
137137
selector: '//*[@data-id="treeViewLivm trace step" and contains(.,"133")]',
138138
})
139139
.goToVMTraceStep(261)
140-
.waitForElementPresent('.highlightLine8')
140+
.waitForElementPresent('.highlightLine8', 60000)
141141
/*
142142
for the test below:
143143
source highlight should remain line `bytes32 idAsk = abi.decode(userData[:33], (bytes32));`
@@ -159,7 +159,7 @@ module.exports = {
159159
.clickLaunchIcon('solidity')
160160
.testContracts('locals.sol', sources[3]['locals.sol'], ['testLocals'])
161161
.clickLaunchIcon('udapp')
162-
.waitForElementPresent('*[data-bs-title="Deploy - transact (not payable)"]', 40000)
162+
.waitForElementPresent('*[data-bs-title="Deploy - transact (not payable)"]', 60000)
163163
.createContract('')
164164
.pause(2000)
165165
.clearConsole()
@@ -259,7 +259,7 @@ module.exports = {
259259
.clearValue('*[data-id="modalDialogCustomPromptText"]')
260260
.setValue('*[data-id="modalDialogCustomPromptText"]', 'https://remix-rinkeby.ethdevops.io')
261261
.modalFooterOKClick()
262-
.waitForElementPresent('*[title="Deploy - transact (not payable)"]', 65000) // wait for the compilation to succeed
262+
.waitForElementPresent('*[title="Deploy - transact (not payable)"]', 60000) // wait for the compilation to succeed
263263
.clickLaunchIcon('debugger')
264264
.clearValue('*[data-id="debuggerTransactionInput"]')
265265
.setValue('*[data-id="debuggerTransactionInput"]', '0x156dbf7d0f9b435dd900cfc8f3264d523dd25733418ddbea1ce53e294f421013')
@@ -285,7 +285,7 @@ module.exports = {
285285
.goToVMTraceStep(80)
286286
.waitForElementVisible('*[data-id="debugGoToRevert"]', 60000)
287287
.click('*[data-id="debugGoToRevert"]')
288-
.waitForElementContainsText('*[data-id="asmitems"] div[selected="selected"]', '114 REVERT')
288+
.waitForElementContainsText('*[data-id="asmitems"] div[selected="selected"]', '114 REVERT', 60000)
289289
}
290290
}
291291

‎apps/remix-ide-e2e/src/tests/defaultLayout.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ module.exports = {
88
},
99

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

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

‎apps/remix-ide-e2e/src/tests/dgit_local.test.ts‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -143,9 +143,7 @@ module.exports = {
143143
.click('*[data-id="commits-panel"]')
144144
.waitForElementPresent({
145145
selector: `//*[@data-id="commit-summary-testcommit2-"]`,
146-
locateStrategy: 'xpath',
147-
timeout: 60000
148-
}).pause(2000)
146+
locateStrategy: 'xpath', timeout: 60000 }).pause(2000)
149147
},
150148
'check the log for testcommit2 #group1': async function (browser: NightwatchBrowser) {
151149
const logs = await getGitLog('/tmp/git/bare.git')
@@ -340,9 +338,7 @@ module.exports = {
340338
})
341339
.waitForElementVisible({
342340
selector: "//*[@data-id='branches-panel-content']//*[@data-id='branches-toggle-current-branch-master']",
343-
locateStrategy: 'xpath',
344-
timeout: 60000
345-
})
341+
locateStrategy: 'xpath', timeout: 60000 })
346342
},
347343
'check if test file is gone #group2': function (browser: NightwatchBrowser) {
348344
browser

0 commit comments

Comments
 (0)