Skip to content

Commit 980c80e

Browse files
authored
Merge pull request #6537 from remix-project-org/vsIcons
toggle icons on top bar
2 parents de845d8 + 948d57e commit 980c80e

File tree

37 files changed

+904
-374
lines changed

37 files changed

+904
-374
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ parameters:
1414
default: ""
1515
run_file_tests_keyword:
1616
type: enum
17-
enum: ["", "ai_panel", "ballot", "ballot_0_4_14", "blockchain", "bottom-bar", "circom", "code_format", "compile_run_widget", "compiler_api", "contract_flattener", "contract_verification", "debugger", "defaultLayout", "deploy_vefiry", "dgit_github", "dgit_local", "editor", "editorHoverContext", "editorReferences", "editor_error_marker", "editor_line_text", "eip1153", "eip7702", "environment-account", "erc721", "etherscan_api", "expandAllFolders", "fileExplorer", "fileManager_api", "file_decorator", "file_explorer_context_menu", "file_explorer_dragdrop", "file_explorer_multiselect", "generalSettings", "gist", "homeTab", "importFromGithub", "layout", "learneth", "libraryDeployment", "matomo-bot-detection", "matomo-consent", "mcp_all_resources", "mcp_all_tools", "mcp_server_complete", "mcp_server_connection", "mcp_server_lifecycle", "mcp_workflow_integration", "metamask", "migrateFileSystem", "noir", "pinned_contracts", "pinned_plugin", "pluginManager", "plugin_api", "providers", "proxy_oz_v4", "proxy_oz_v5", "proxy_oz_v5_non_shanghai_runtime", "publishContract", "quickDapp_metamask", "recorder", "remixd", "runAndDeploy", "script-runner", "search", "signingMessage", "sol2uml", "solidityImport", "solidityUnittests", "specialFunctions", "staticAnalysis", "stressEditor", "template_exp_modal", "terminal", "transactionExecution", "txListener", "uniswap_v4_core", "url", "usingWebWorker", "verticalIconsPanel", "vm_state", "vyper_api", "walkthrough", "workspace", "workspace_git"]
17+
enum: ["", "ai_panel", "ballot", "ballot_0_4_14", "blockchain", "bottom-bar", "circom", "code_format", "compile_run_widget", "compiler_api", "contract_flattener", "contract_verification", "debugger", "defaultLayout", "deploy_vefiry", "dgit_github", "dgit_local", "editor", "editorHoverContext", "editorReferences", "editor_error_marker", "editor_line_text", "eip1153", "eip7702", "environment-account", "erc721", "etherscan_api", "expandAllFolders", "fileExplorer", "fileManager_api", "file_decorator", "file_explorer_context_menu", "file_explorer_dragdrop", "file_explorer_multiselect", "generalSettings", "gist", "homeTab", "importFromGithub", "layout", "learneth", "libraryDeployment", "matomo-bot-detection", "matomo-consent", "mcp_all_resources", "mcp_all_tools", "mcp_server_complete", "mcp_server_connection", "mcp_server_lifecycle", "mcp_workflow_integration", "metamask", "migrateFileSystem", "noir", "pinned_contracts", "pluginManager", "plugin_api", "providers", "proxy_oz_v4", "proxy_oz_v5", "proxy_oz_v5_non_shanghai_runtime", "publishContract", "quickDapp_metamask", "recorder", "remixd", "runAndDeploy", "script-runner", "search", "signingMessage", "sol2uml", "solidityImport", "solidityUnittests", "specialFunctions", "staticAnalysis", "stressEditor", "template_exp_modal", "terminal", "toggle_panels", "transactionExecution", "txListener", "uniswap_v4_core", "url", "usingWebWorker", "verticalIconsPanel", "vm_state", "vyper_api", "walkthrough", "workspace", "workspace_git"]
1818
default: ""
1919
run_flaky_tests:
2020
type: boolean

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,17 +48,14 @@ module.exports = {
4848
.assert.containsText('h6[data-id="sidePanelSwapitTitle"]', 'FILE EXPLORER')
4949
},
5050

51-
'Toggles Terminal': function (browser: NightwatchBrowser) {
51+
'Hides Terminal': function (browser: NightwatchBrowser) {
5252
browser.waitForElementVisible('div[data-id="terminalContainer"]')
5353
.assert.elementPresent('div[data-id="terminalCli"]')
5454
.assert.elementPresent('div[data-id="terminalContainer"]')
5555
.waitForElementVisible('div[data-id="terminalContainer"]')
5656
.waitForElementVisible('div[data-id="terminalCli"]')
57-
.click('i[data-id="terminalToggleIcon"]')
58-
.checkElementStyle('div[data-id="terminalToggleMenu"]', 'height', '35px')
59-
.assert.not.elementPresent('div[data-id="terminalCli"]')
60-
.click('i[data-id="terminalToggleIcon"]')
61-
.waitForElementVisible('div[data-id="terminalCli"]')
57+
.click('i[data-id="hideBottomPanel"]')
58+
.waitForElementNotVisible('div[data-id="terminalCli"]')
6259
},
6360

6461
'Switch Tabs using tabs icon': function (browser: NightwatchBrowser) {

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,34 +15,34 @@ module.exports = {
1515
browser.waitForElementVisible('[data-id="movePluginToRight"]')
1616
.click('[data-id="movePluginToRight"]')
1717
.waitForElementVisible('[data-id="movePluginToLeft"]')
18-
.waitForElementVisible('.pinned-panel h6[data-id="sidePanelSwapitTitle"]')
18+
.waitForElementVisible('.right-side-panel h6[data-id="sidePanelSwapitTitle"]')
1919
.clickLaunchIcon('filePanel')
2020
.assert.containsText('.sidepanel h6[data-id="sidePanelSwapitTitle"]', 'FILE EXPLORER')
21-
.assert.containsText('.pinned-panel h6[data-id="sidePanelSwapitTitle"]', 'SOLIDITY COMPILER')
21+
.assert.containsText('.right-side-panel h6[data-id="sidePanelSwapitTitle"]', 'SOLIDITY COMPILER')
2222
},
2323
'Should unpin and focus on solidity compiler in the left side panel': function (browser: NightwatchBrowser) {
2424
browser.waitForElementVisible('[data-id="movePluginToLeft"]')
2525
.click('[data-id="movePluginToLeft"]')
2626
.waitForElementVisible('[data-id="movePluginToRight"]')
2727
.assert.containsText('.sidepanel h6[data-id="sidePanelSwapitTitle"]', 'SOLIDITY COMPILER')
28-
.waitForElementNotVisible('.pinned-panel h6[data-id="sidePanelSwapitTitle"]')
28+
.waitForElementNotVisible('.right-side-panel h6[data-id="sidePanelSwapitTitle"]')
2929
},
3030
'Should pin a plugin while an another plugin is already pinned': function (browser: NightwatchBrowser) {
3131
browser.waitForElementVisible('[data-id="movePluginToRight"]')
3232
.click('[data-id="movePluginToRight"]')
3333
.waitForElementVisible('[data-id="movePluginToLeft"]')
34-
.waitForElementVisible('.pinned-panel h6[data-id="sidePanelSwapitTitle"]')
35-
.assert.containsText('.pinned-panel h6[data-id="sidePanelSwapitTitle"]', 'SOLIDITY COMPILER')
34+
.waitForElementVisible('.right-side-panel h6[data-id="sidePanelSwapitTitle"]')
35+
.assert.containsText('.right-side-panel h6[data-id="sidePanelSwapitTitle"]', 'SOLIDITY COMPILER')
3636
.clickLaunchIcon('udapp')
3737
.click('[data-id="movePluginToRight"]')
3838
.waitForElementVisible('[data-id="movePluginToLeft"]')
39-
.assert.containsText('.pinned-panel h6[data-id="sidePanelSwapitTitle"]', 'DEPLOY & RUN TRANSACTIONS')
39+
.assert.containsText('.right-side-panel h6[data-id="sidePanelSwapitTitle"]', 'DEPLOY & RUN TRANSACTIONS')
4040
.assert.containsText('.sidepanel h6[data-id="sidePanelSwapitTitle"]', 'SOLIDITY COMPILER')
4141
},
4242
'Should pin a pinned plugin to the right after reloading the page': function (browser: NightwatchBrowser) {
4343
browser.refreshPage()
44-
.waitForElementVisible('.pinned-panel h6[data-id="sidePanelSwapitTitle"]')
45-
.assert.containsText('.pinned-panel h6[data-id="sidePanelSwapitTitle"]', 'DEPLOY & RUN TRANSACTIONS')
44+
.waitForElementVisible('.right-side-panel h6[data-id="sidePanelSwapitTitle"]')
45+
.assert.containsText('.right-side-panel h6[data-id="sidePanelSwapitTitle"]', 'DEPLOY & RUN TRANSACTIONS')
4646
},
4747
'Should maintain logged state of udapp plugin after pinning and unpinning': function (browser: NightwatchBrowser) {
4848
browser.waitForElementVisible('*[data-id="treeViewLitreeViewItemcontracts"]')

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

Lines changed: 0 additions & 70 deletions
This file was deleted.

0 commit comments

Comments
 (0)