Skip to content

Commit fdcd66e

Browse files
ci-botAniket-Engg
authored andcommitted
fixh e2e solidity import modal
1 parent 61a683d commit fdcd66e

File tree

5 files changed

+26
-19
lines changed

5 files changed

+26
-19
lines changed

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ module.exports = {
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"]', 5000)
5050
.click('[data-id="compile-run-analysis-menu-item"]')
5151
.waitForElementVisible('[data-id="compile-run-analysis-menu-item-panel"]', 5000)
5252
.click('[data-id="run-solidity-scan-submenu-item"]')
@@ -56,6 +56,4 @@ module.exports = {
5656
.waitForElementContainsText('*[data-id="terminalJournal"]', 'Scan Summary:', 30000)
5757
.verifyContracts(['Ballot'])
5858
}
59-
60-
61-
}
59+
}

apps/remix-ide-e2e/src/tests/solidityImport.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,8 +155,8 @@ module.exports = {
155155
.click('[data-id="github-dropdown-toggle"]')
156156
.waitForElementVisible('[data-id="github-dropdown-item-clone"]')
157157
.click('[data-id="github-dropdown-item-clone"]')
158-
.waitForElementVisible('[data-id="fileSystemModalDialogModalBody-react"]')
159-
.click('[data-id="fileSystemModalDialogModalBody-react"]')
158+
.waitForElementVisible('[data-id="topbarModalDialogModalBody-react"]')
159+
.click('[data-id="topbarModalDialogModalBody-react"]')
160160
.waitForElementVisible('[data-id="modalDialogCustomPromptTextClone"]')
161161
.setValue('[data-id="modalDialogCustomPromptTextClone"]', 'https://github.com/remix-project-org/remix-reward')
162162
.click('[data-id="fileSystem-modal-footer-ok-react"]')

apps/remix-ide-e2e/src/tests/workspace.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -482,6 +482,7 @@ module.exports = {
482482
.click(selector)
483483
.waitForElementVisible('*[data-id="workspacesubMenuOverlay"]')
484484
.waitForElementVisible('*[data-id="workspacesubMenuRename"]')
485+
.pause(1000)
485486
.click('*[data-id="workspacesubMenuRename"]') // rename workspace_name
486487
.useCss()
487488
// .waitForElementVisible('*[data-id="treeViewLitreeViewItemtests"]')
@@ -519,7 +520,6 @@ module.exports = {
519520
.click('*[data-id="topbarModalModalDialogModalFooter-react"] .modal-ok')
520521
.waitForElementVisible('*[data-id="workspacesSelect"]')
521522
.click('*[data-id="workspacesSelect"]')
522-
.pause()
523523
.waitForElementNotPresent(`[data-id="dropdown-item-workspace_name_1"]`)
524524
.end()
525525
},

apps/remixdesktop/test/tests/app/github_2.test.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,13 @@ const tests = {
4747
.pause(1000)
4848
.click('*[data-id="saveGitHubCredentials"]')
4949
},
50-
// 'check if the settings are loaded #group1 #group2': function (browser: NightwatchBrowser) {
51-
// browser
52-
// .waitForElementVisible('*[data-id="connected-as-bunsenstraat"]')
53-
// .waitForElementVisible('*[data-id="connected-img-bunsenstraat"]')
54-
// .waitForElementVisible('*[data-id="connected-link-bunsenstraat"]')
55-
// .waitForElementVisible('*[data-id="remotes-panel"]')
56-
// },
50+
'check if the settings are loaded #group1 #group2': function (browser: NightwatchBrowser) {
51+
browser
52+
.waitForElementVisible('*[data-id="connected-as-bunsenstraat"]')
53+
.waitForElementVisible('*[data-id="connected-img-bunsenstraat"]')
54+
.waitForElementVisible('*[data-id="connected-link-bunsenstraat"]')
55+
.waitForElementVisible('*[data-id="remotes-panel"]')
56+
},
5757
// 'check the FE for the auth user #group1 #group2': function (browser: NightwatchBrowser) {
5858
// browser
5959
// .clickLaunchIcon('filePanel')

libs/remix-ui/top-bar/src/lib/remix-ui-topbar.tsx

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -424,15 +424,15 @@ export function RemixUiTopbar () {
424424
className="d-flex flex-row align-items-center justify-content-evenly m-1"
425425
style={{ minWidth: '33%' }}
426426
>
427-
<span
427+
<div
428428
className="d-flex align-items-center justify-content-between mr-3 cursor-pointer"
429429
onClick={async () => {
430430
await plugin.call('tabs', 'focus', 'home')
431431
_paq.push(['trackEvent', 'topbar', 'header', 'Home'])
432432
}}
433433
data-id="verticalIconsHomeIcon"
434434
>
435-
<span
435+
<div
436436
style={{ width: '35px', height: '35px' }}
437437
data-id="verticalIconsHomeIcon"
438438
className="remixui_homeIcon"
@@ -442,9 +442,18 @@ export function RemixUiTopbar () {
442442
}}
443443
>
444444
<BasicLogo />
445-
</span>
446-
<span className="text-primary ml-2 font-weight-light text-uppercase cursor-pointer" style={{ fontSize: '1.2rem' }}>Remix</span>
447-
</span>
445+
</div>
446+
<div
447+
className="text-primary ml-2 font-weight-light text-uppercase cursor-pointer"
448+
style={{ fontSize: '1.2rem' }}
449+
onClick={async () => {
450+
await plugin.call('tabs', 'focus', 'home')
451+
_paq.push(['trackEvent', 'topbar', 'header', 'Home'])
452+
}}
453+
>
454+
Remix
455+
</div>
456+
</div>
448457
<span
449458
className="btn btn-sm border border-secondary text-decoration-none font-weight-light"
450459
onClick={() => {

0 commit comments

Comments
 (0)