Skip to content

Commit 5a82fe4

Browse files
author
ci-bot
committed
fix_tests
1 parent c490a1d commit 5a82fe4

File tree

5 files changed

+22
-22
lines changed

5 files changed

+22
-22
lines changed

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ module.exports = {
6565
.waitForElementContainsText('*[data-id="testTabSolidityUnitTestsOutput"]', '✘ Should fail for wrong value200', 60000)
6666
.waitForElementContainsText('*[data-id="testTabSolidityUnitTestsOutput"]', 'Passed: 2', 60000)
6767
.waitForElementContainsText('*[data-id="testTabSolidityUnitTestsOutput"]', 'Failed: 1', 60000)
68-
.waitForElementContainsText('*[data-id="testTabSolidityUnitTestsOutput"]', 'FAILMyTest (tests/simple_storage_test.sol, 60000)', 60000)
68+
.waitForElementContainsText('*[data-id="testTabSolidityUnitTestsOutput"]', 'FAILMyTest (tests/simple_storage_test.sol)', 60000)
6969
// '.failed_tests_simple_storage_test_solMyTest' is the class for 'FAIL' label
7070
.verify.elementPresent('.failed_tests_simple_storage_test_solMyTest')
7171
},
@@ -77,7 +77,7 @@ module.exports = {
7777
.click('*[data-id="verticalIconsKindsolidityUnitTesting"]')
7878
.waitForElementPresent('*[data-id="testTabCheckAllTests"]')
7979
.click('*[data-id="testTabCheckAllTests"]')
80-
.clickElementAtPosition('.singleTestLabel', 60000)
80+
.clickElementAtPosition('.singleTestLabel', 1)
8181
.scrollAndClick('*[data-id="testTabRunTestsTabRunAction"]')
8282
.waitForElementContainsText('*[data-id="testTabSolidityUnitTestsOutput"]', 'tests/ks2b_test.sol', 60000)
8383
.waitForElementContainsText('*[data-id="testTabSolidityUnitTestsOutput"]', '✓ Check project exists', 60000)
@@ -93,7 +93,7 @@ module.exports = {
9393
'Should stop unit tests during test execution` #group2': function (browser: NightwatchBrowser) {
9494
browser.waitForElementPresent('*[data-id="verticalIconsKindfilePanel"]')
9595
.waitForElementPresent('*[data-id="testTabRunTestsTabRunAction"]')
96-
.clickElementAtPosition('.singleTestLabel', 60000)
96+
.clickElementAtPosition('.singleTestLabel', 0)
9797
.scrollAndClick('*[data-id="testTabRunTestsTabRunAction"]')
9898
.click('*[data-id="testTabRunTestsTabStopAction"]')
9999
.waitForElementContainsText('*[data-id="testTabSolidityUnitTestsOutput"]', 'tests/Ballot_test.sol', 60000)
@@ -113,7 +113,7 @@ module.exports = {
113113
.clickElementAtPosition('.singleTestLabel', 2)
114114
.scrollAndClick('*[data-id="testTabRunTestsTabRunAction"]')
115115
.waitForElementContainsText('*[data-id="testTabSolidityUnitTestsOutput"]', 'SyntaxError: No visibility specified', 60000)
116-
.waitForElementContainsText('*[data-id="testTabTestsExecutionStoppedError"]', 'The test execution has been stopped because of error(s, 60000) in your test file', 60000)
116+
.waitForElementContainsText('*[data-id="testTabTestsExecutionStoppedError"]', 'The test execution has been stopped because of error(s) in your test file', 60000)
117117
.click('#solidityUnittestsOutput *[data-id="tests/compilationError_test.sol"]')
118118
.pause(1000)
119119
.getEditorValue((content) => browser.assert.ok(content.indexOf('contract failOnCompilation {') !== -1))
@@ -291,12 +291,12 @@ module.exports = {
291291
.waitForElementContainsText('#solidityUnittestsOutput', '✓ Check winnin proposal with return value', 60000)
292292
.click('#Check_winning_proposal_failed')
293293
.waitForElementContainsText('*[data-id="sidePanelSwapitTitle"]', 'DEBUGGER', 60000)
294-
.waitForElementContainsText('*[data-id="functionPanel"]', 'checkWinningProposalFailed(, 60000)', 60000)
294+
.waitForElementContainsText('*[data-id="functionPanel"]', 'checkWinningProposalFailed()', 60000)
295295
.waitForElementVisible('*[data-id="dropdownPanelSolidityLocals"]').pause(1000)
296296
.waitForElementContainsText('*[data-id="solidityLocals"]', 'No data available', 60000)
297297
.goToVMTraceStep(316)
298-
.waitForElementContainsText('*[data-id="functionPanel"]', 'checkWinningProposalFailed(, 60000)', 60000)
299-
.waitForElementContainsText('*[data-id="functionPanel"]', 'vote(proposal, 60000)', 60000)
298+
.waitForElementContainsText('*[data-id="functionPanel"]', 'checkWinningProposalFailed()', 60000)
299+
.waitForElementContainsText('*[data-id="functionPanel"]', 'vote(proposal)', 60000)
300300
.waitForElementVisible({
301301
locateStrategy: 'xpath',
302302
selector: "//*[@data-id='treeViewDivtreeViewItemsender' and contains(.,'Ballot.Voter')]"
@@ -305,10 +305,10 @@ module.exports = {
305305
.clickLaunchIcon('solidityUnitTesting').pause(2000)
306306
.scrollAndClick('#Check_winning_proposal_passed')
307307
.waitForElementContainsText('*[data-id="sidePanelSwapitTitle"]', 'DEBUGGER', 60000)
308-
.waitForElementContainsText('*[data-id="functionPanel"]', 'checkWinningProposalPassed(, 60000)', 60000)
308+
.waitForElementContainsText('*[data-id="functionPanel"]', 'checkWinningProposalPassed()', 60000)
309309
.goToVMTraceStep(1451)
310310
.waitForElementContainsText('*[data-id="functionPanel"]', 'equal(a, b, message)', 60000)
311-
.waitForElementContainsText('*[data-id="functionPanel"]', 'checkWinningProposalPassed(, 60000)', 60000)
311+
.waitForElementContainsText('*[data-id="functionPanel"]', 'checkWinningProposalPassed()', 60000)
312312
// remix_test.sol should be opened in editor
313313
.getEditorValue((content) => browser.assert.ok(content.indexOf('library Assert {') !== -1))
314314
.click('*[id="debuggerTransactionStartButtonContainer"]') // stop debugging
@@ -321,7 +321,7 @@ module.exports = {
321321
.waitForElementContainsText('*[data-id="sidePanelSwapitTitle"]', 'DEBUGGER', 60000)
322322
.goToVMTraceStep(1151)
323323
.waitForElementContainsText('*[data-id="functionPanel"]', 'equal(a, b, message)', 60000)
324-
.waitForElementContainsText('*[data-id="functionPanel"]', 'checkWinningProposalAgain(, 60000)', 60000)
324+
.waitForElementContainsText('*[data-id="functionPanel"]', 'checkWinningProposalAgain()', 60000)
325325
//.pause(5000)
326326
.click('*[id="debuggerTransactionStartButtonContainer"]') // stop debugging
327327
.openFile('tests/ballotFailedDebug_test.sol')
@@ -331,9 +331,9 @@ module.exports = {
331331
.scrollAndClick('#Check_winnin_proposal_with_return_value')
332332
.pause(5000)
333333
.waitForElementContainsText('*[data-id="sidePanelSwapitTitle"]', 'DEBUGGER', 60000)
334-
.waitForElementContainsText('*[data-id="functionPanel"]', 'checkWinninProposalWithReturnValue(, 60000)', 60000)
334+
.waitForElementContainsText('*[data-id="functionPanel"]', 'checkWinninProposalWithReturnValue()', 60000)
335335
.goToVMTraceStep(321)
336-
.waitForElementContainsText('*[data-id="functionPanel"]', 'checkWinninProposalWithReturnValue(, 60000)', 60000)
336+
.waitForElementContainsText('*[data-id="functionPanel"]', 'checkWinninProposalWithReturnValue()', 60000)
337337
.clickLaunchIcon('filePanel')
338338
.pause(2000)
339339
.openFile('tests/ballotFailedDebug_test.sol')

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ module.exports = {
217217
.executeScriptInTerminal('remix.execute(\'scripts/test_filtering_event.ts\')', 60000) // re-emit the event
218218
.waitForElementContainsText('*[data-id="terminalJournal"]', '2', 60000)
219219
.waitForElementContainsText('*[data-id="terminalJournal"]', 'false')
220-
}, 60000)
220+
})
221221

222222
},
223223

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ const tests = {
160160
.waitForElementVisible('*[data-id="unpinnedInstance0xf8e81D47203A594245E36C48e151709F0C19fBe8"]')
161161
.click('*[data-id="fork-state-icon"]')
162162
.waitForElementVisible('*[data-id="udappNotifyModalDialogModalTitle-react"]')
163-
.click('input[data-id="modalDialogForkState"]', 60000)
163+
.click('input[data-id="modalDialogForkState"]')
164164
.setValue('input[data-id="modalDialogForkState"]', 'forkedState_2')
165165
.modalFooterOKClick('udappNotify')
166166
.waitForElementVisible('*[data-shared="tooltipPopup"]', 60000)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ module.exports = {
131131
})
132132
.waitForElementContainsText('[data-id="test_error.vy"]', 'ERROR', 60000)
133133
.waitForElementContainsText('[data-id="test_error.vy"]', 'StructureException:Unsupported syntax for module namespace')
134-
.frameParent(, 60000)
134+
.frameParent()
135135
},
136136

137137
'Compile test contract and deploy to remix VM #group1': function (browser: NightwatchBrowser) {

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ module.exports = {
143143
.switchWorkspace('awesome-remix')
144144
.switchWorkspace('awesome-remix1')
145145
.switchWorkspace('awesome-remix2')
146-
.switchWorkspace('awesome-remix3', 60000)
146+
.switchWorkspace('awesome-remix3')
147147
},
148148

149149
'Should display error message in modal for failed clone #group2': function (browser: NightwatchBrowser) {
@@ -191,7 +191,7 @@ module.exports = {
191191
.waitForElementContainsText('[data-id="custom-dropdown-items"]', 'origin/dev', 60000)
192192
.waitForElementContainsText('[data-id="custom-dropdown-items"]', 'origin/production', 60000)
193193
.waitForElementContainsText('[data-id="custom-dropdown-items"]', 'origin/setup')
194-
.expect.element('[data-id="workspaceGit-main"]').text.to.contain('✓ ', 60000)
194+
.expect.element('[data-id="workspaceGit-main"]').text.to.contain('✓ ')
195195
},
196196

197197
'Should a checkout to a remote branch #group3': function (browser: NightwatchBrowser) {
@@ -203,7 +203,7 @@ module.exports = {
203203
.pause(5000)
204204
.waitForElementPresent('[data-id="treeViewDivtreeViewItemdev.ts"]')
205205
.click('[data-id="workspaceGitBranchesDropdown"]')
206-
.expect.element('[data-id="workspaceGit-dev"]').text.to.contain('✓ ', 60000)
206+
.expect.element('[data-id="workspaceGit-dev"]').text.to.contain('✓ ')
207207
},
208208

209209
'Should search for a branch (local and remote) #group3': function (browser: NightwatchBrowser) {
@@ -229,7 +229,7 @@ module.exports = {
229229
.pause(2000)
230230
.click('[data-id="workspaceGitBranchesDropdown"]')
231231
.waitForElementVisible('[data-id="custom-dropdown-menu"]')
232-
.expect.element('[data-id="workspaceGit-newLocalBranch"]').text.to.contain('✓ ', 60000)
232+
.expect.element('[data-id="workspaceGit-newLocalBranch"]').text.to.contain('✓ ')
233233
},
234234

235235
'Should checkout to an existing local branch #group3': function (browser: NightwatchBrowser) {
@@ -259,7 +259,7 @@ module.exports = {
259259
.click('[data-id="switchBranch-modal-footer-cancel-react"]')
260260
.pause(2000)
261261
.click('[data-id="workspaceGitBranchesDropdown"]')
262-
.expect.element('[data-id="workspaceGit-main"]').text.to.contain('✓ ', 60000)
262+
.expect.element('[data-id="workspaceGit-main"]').text.to.contain('✓ ')
263263
},
264264

265265
'Should force checkout to a branch with existing local changes #group3': function (browser: NightwatchBrowser) {
@@ -272,7 +272,7 @@ module.exports = {
272272
.click('[data-id="switchBranch-modal-footer-ok-react"]')
273273
.pause(2000)
274274
.click('[data-id="workspaceGitBranchesDropdown"]')
275-
.expect.element('[data-id="workspaceGit-dev"]').text.to.contain('✓ ', 60000)
275+
.expect.element('[data-id="workspaceGit-dev"]').text.to.contain('✓ ')
276276
},
277277

278278
// GIT BRANCHES E2E END
@@ -380,7 +380,7 @@ module.exports = {
380380
.click('[data-id="workspacesSelect"]')
381381
.waitForElementVisible('*[data-id="dropdown-item-test-branch-submodule"]')
382382
.waitForElementVisible('*[data-id="dropdown-item-default_workspace"]')
383-
.click('*[data-id="dropdown-item-default_workspace"]', 60000)
383+
.click('*[data-id="dropdown-item-default_workspace"]')
384384
},
385385
'When switching to main update the modules #group4': function (browser: NightwatchBrowser) {
386386
browser

0 commit comments

Comments
 (0)