mirror
/
remix-project
mirror of https://github.com/ethereum/remix-project.git
2
0
Fork 0
Code Issues Releases Wiki Activity

Updated unique identifiers to follow naming convention

Browse Source
pull/1/head
ioedeveloper 5 years ago
parent cfbe3e2ff1
commit cc71c349e7
8 changed files with 31 additions and 31 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      src/app.js
  2. 2
      src/app/components/side-panel.js
  3. 2
      src/app/components/vertical-icons.js
  4. 2
      src/app/panels/file-panel.js
  5. 6
      src/app/panels/terminal.js
  6. 2
      src/app/ui/TreeView.js
  7. 4
      src/app/ui/landing-page/landing-page.js
  8. 40
      test-browser/tests/homepage.js

4
src/app.js
Unescape View File

@ -141,14 +141,14 @@ class App {
if (self._view.el) return self._view.el if (self._view.el) return self._view.el
// not resizable // not resizable
self._view.iconpanel = yo` self._view.iconpanel = yo`
<div id="icon-panel" data-id="icon-panel" class="${css.iconpanel} bg-light"> <div id="icon-panel" data-id="remixIdeIconPanel" class="${css.iconpanel} bg-light">
${''} ${''}
</div> </div>
` `
// center panel, resizable // center panel, resizable
self._view.sidepanel = yo` self._view.sidepanel = yo`
<div id="side-panel" data-id="side-panel" style="min-width: 320px;" class=${css.sidepanel}> <div id="side-panel" data-id="remixIdeSidePanel" style="min-width: 320px;" class=${css.sidepanel}>
${''} ${''}
</div> </div>
` `

2
src/app/components/side-panel.js
Unescape View File

@ -132,7 +132,7 @@ export class SidePanel extends AbstractPanel {
return yo` return yo`
<header class="${css.swapitHeader} px-3"> <header class="${css.swapitHeader} px-3">
<h6 class="${css.swapitTitle}" data-id="swapitTitle">${name}</h6> <h6 class="${css.swapitTitle}" data-id="sidePanelFileExplorerTitle">${name}</h6>
${docLink} ${docLink}
${versionWarning} ${versionWarning}
</header> </header>

2
src/app/components/vertical-icons.js
Unescape View File

@ -227,7 +227,7 @@ export class VerticalIcons extends Plugin {
this.appManager.ensureActivated('home') this.appManager.ensureActivated('home')
}}" }}"
plugin="home" title="Home" plugin="home" title="Home"
data-id="homeIcon" data-id="remixIdeHomeIcon"
> >
<svg id="Ebene_2" data-name="Ebene 2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 105 100"> <svg id="Ebene_2" data-name="Ebene 2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 105 100">
<title>remix_logo1</title> <title>remix_logo1</title>

2
src/app/panels/file-panel.js
Unescape View File

@ -64,7 +64,7 @@ module.exports = class Filepanel extends ViewPlugin {
const explorers = yo` const explorers = yo`
<div> <div>
<div class=${css.treeview} data-id="fileExplorerInit">${fileExplorer.init()}</div> <div class=${css.treeview} data-id="sidePanelFileExplorerTreeView">${fileExplorer.init()}</div>
<div class="filesystemexplorer ${css.treeview}">${fileSystemExplorer.init()}</div> <div class="filesystemexplorer ${css.treeview}">${fileSystemExplorer.init()}</div>
</div> </div>
` `

6
src/app/panels/terminal.js
Unescape View File

@ -130,7 +130,7 @@ class Terminal extends Plugin {
` `
self._view.icon = yo` self._view.icon = yo`
<i onmouseenter=${hover} onmouseleave=${hover} onmousedown=${minimize} <i onmouseenter=${hover} onmouseleave=${hover} onmousedown=${minimize}
class="btn btn-secondary btn-sm align-items-center ${css.toggleTerminal} fas fa-angle-double-down" data-id="toggleTerminal"></i>` class="btn btn-secondary btn-sm align-items-center ${css.toggleTerminal} fas fa-angle-double-down" data-id="homeContainerTerminalToggle"></i>`
self._view.dragbar = yo` self._view.dragbar = yo`
<div onmousedown=${mousedown} class=${css.dragbarHorizontal}></div>` <div onmousedown=${mousedown} class=${css.dragbarHorizontal}></div>`
@ -146,7 +146,7 @@ class Terminal extends Plugin {
self._view.bar = yo` self._view.bar = yo`
<div class="${css.bar}"> <div class="${css.bar}">
${self._view.dragbar} ${self._view.dragbar}
<div class="${css.menu} border-top border-dark bg-light" data-id="toggleTerminalMenu"> <div class="${css.menu} border-top border-dark bg-light" data-id="homeContainerTerminalToggleMenu">
${self._view.icon} ${self._view.icon}
<div class=${css.clear} id="clearConsole" onclick=${clear}> <div class=${css.clear} id="clearConsole" onclick=${clear}>
<i class="fas fa-ban" aria-hidden="true" title="Clear console" <i class="fas fa-ban" aria-hidden="true" title="Clear console"
@ -177,7 +177,7 @@ class Terminal extends Plugin {
</div> </div>
` `
self._view.term = yo` self._view.term = yo`
<div class="${css.terminal_container}" data-id="terminal_container" onscroll=${throttle(reattach, 10)} onclick=${focusinput}> <div class="${css.terminal_container}" data-id="terminalContainer" onscroll=${throttle(reattach, 10)} onclick=${focusinput}>
${self._components.autoCompletePopup.render()} ${self._components.autoCompletePopup.render()}
<div class="bg-secondary" data-id="terminalContainerDisplay" style=" <div class="bg-secondary" data-id="terminalContainerDisplay" style="
position: absolute; position: absolute;

2
src/app/ui/TreeView.js
Unescape View File

@ -91,7 +91,7 @@ class TreeView {
var list = yo`<ul key=${keyPath} class=${css.ul_tv}>${children}</ul>` var list = yo`<ul key=${keyPath} class=${css.ul_tv}>${children}</ul>`
list.style.display = 'none' list.style.display = 'none'
caret.className = list.style.display === 'none' ? `fas fa-caret-right caret ${css.caret_tv}` : `fas fa-caret-down caret ${css.caret_tv}` caret.className = list.style.display === 'none' ? `fas fa-caret-right caret ${css.caret_tv}` : `fas fa-caret-down caret ${css.caret_tv}`
caret.setAttribute('data-id', `toggle_${keyPath}`) caret.setAttribute('data-id', `fileExplorerTreeToggle${keyPath}`)
label.onclick = function () { label.onclick = function () {
self.expand(keyPath) self.expand(keyPath)
} }

4
src/app/ui/landing-page/landing-page.js
Unescape View File

@ -177,7 +177,7 @@ export class LandingPage extends ViewPlugin {
document.location.reload() document.location.reload()
} }
const img = yo`<img src="assets/img/hexagon-remix-greengrey-texture.png"></img>` const img = yo`<img src="assets/img/hexagon-remix-greengrey-texture.png"></img>`
let container = yo`<div class="${css.homeContainer} bg-light" data-id="homeContainer"> let container = yo`<div class="${css.homeContainer} bg-light" div[data-id="mainPanelHomeContainer">
<div> <div>
<div class="alert alert-info clearfix ${css.thisJumboton}"> <div class="alert alert-info clearfix ${css.thisJumboton}">
<div class="${css.headlineContainer}"> <div class="${css.headlineContainer}">
@ -189,7 +189,7 @@ export class LandingPage extends ViewPlugin {
</div> </div>
</div><!-- end of jumbotron --> </div><!-- end of jumbotron -->
</div><!-- end of jumbotron container --> </div><!-- end of jumbotron container -->
<div class="row ${css.hpSections}" data-id="hpSections"> <div class="row ${css.hpSections}" data-id="homeContainerHpSections">
<div id="col1" class="col-sm-7"> <div id="col1" class="col-sm-7">
<div class="mb-5"> <div class="mb-5">
<h4>Environments</h4> <h4>Environments</h4>

40
test-browser/tests/homepage.js
Unescape View File

@ -7,24 +7,24 @@ module.exports = {
init(browser, done, 'http://127.0.0.1:8080', false) init(browser, done, 'http://127.0.0.1:8080', false)
}, },
'Loads Icon\'s Panel': function (browser) { 'Loads Icon\'s Panel': function (browser) {
browser.waitForElementVisible('div[data-id="icon-panel"]', 10000) browser.waitForElementVisible('div[data-id="remixIdeIconPanel"]', 10000)
.waitForElementVisible('div[data-id="homeIcon"]') .waitForElementVisible('div[data-id="remixIdeHomeIcon"]')
.waitForElementVisible('div[plugin="fileExplorers"]') .waitForElementVisible('div[plugin="fileExplorers"]')
.waitForElementVisible('div[plugin="pluginManager"]') .waitForElementVisible('div[plugin="pluginManager"]')
.waitForElementVisible('div[plugin="settings"]') .waitForElementVisible('div[plugin="settings"]')
}, },
'Loads Side Panel': function (browser) { 'Loads Side Panel': function (browser) {
browser.waitForElementVisible('div[data-id="side-panel"]') browser.waitForElementVisible('div[data-id="remixIdeSidePanel"]')
.assert.containsText('h6[data-id="swapitTitle"]', 'FILE EXPLORERS') .assert.containsText('h6[data-id="sidePanelFileExplorerTitle"]', 'FILE EXPLORERS')
.waitForElementVisible('div[data-id="fileExplorerInit"]') .waitForElementVisible('div[data-id="sidePanelFileExplorerTreeView"]')
.waitForElementVisible('li[key="browser/4_Ballot_test.sol"]') .waitForElementVisible('li[key="browser/4_Ballot_test.sol"]')
}, },
'Loads Main View': function (browser) { 'Loads Main View': function (browser) {
browser.waitForElementVisible('div[data-id="mainPanelPluginsContainer"]') browser.waitForElementVisible('div[data-id="mainPanelPluginsContainer"]')
.waitForElementVisible('div[data-id="homeContainer"]') .waitForElementVisible('div[div[data-id="mainPanelHomeContainer"]')
.waitForElementVisible('div[data-id="hpSections"]') .waitForElementVisible('div[data-id="homeContainerHpSections"]')
.waitForElementVisible('div[data-id="terminalContainerDisplay"]') .waitForElementVisible('div[data-id="terminalContainerDisplay"]')
}, },
@ -35,37 +35,37 @@ module.exports = {
}, },
'Toggles Side Panel': function (browser) { 'Toggles Side Panel': function (browser) {
browser.waitForElementVisible('div[data-id="side-panel"]') browser.waitForElementVisible('div[data-id="remixIdeSidePanel"]')
.assert.containsText('h6[data-id="swapitTitle"]', 'FILE EXPLORERS') .assert.containsText('h6[data-id="sidePanelFileExplorerTitle"]', 'FILE EXPLORERS')
.clickLaunchIcon('fileExplorers') .clickLaunchIcon('fileExplorers')
.assert.hidden('div[data-id="side-panel"]') .assert.hidden('div[data-id="remixIdeSidePanel"]')
.clickLaunchIcon('fileExplorers') .clickLaunchIcon('fileExplorers')
.assert.visible('div[data-id="side-panel"]') .assert.visible('div[data-id="remixIdeSidePanel"]')
.assert.containsText('h6[data-id="swapitTitle"]', 'FILE EXPLORERS') .assert.containsText('h6[data-id="sidePanelFileExplorerTitle"]', 'FILE EXPLORERS')
}, },
'Toggles Terminal': function (browser) { 'Toggles Terminal': function (browser) {
browser.waitForElementVisible('div[data-id="terminal_container"]') browser.waitForElementVisible('div[data-id="terminalContainer"]')
.assert.visible('div[data-id="terminalContainerDisplay"]') .assert.visible('div[data-id="terminalContainerDisplay"]')
.click('i[data-id="toggleTerminal"]') .click('i[data-id="homeContainerTerminalToggle"]')
.checkElementStyle('div[data-id="toggleTerminalMenu"]', 'height', '35px') .checkElementStyle('div[data-id="homeContainerTerminalToggleMenu"]', 'height', '35px')
.click('i[data-id="toggleTerminal"]') .click('i[data-id="homeContainerTerminalToggle"]')
.assert.visible('div[data-id="terminalContainerDisplay"]') .assert.visible('div[data-id="terminalContainerDisplay"]')
}, },
'Toggles File Explorer Browser': function (browser) { 'Toggles File Explorer Browser': function (browser) {
browser browser
.waitForElementVisible('div[data-id="fileExplorerInit"]') .waitForElementVisible('div[data-id="sidePanelFileExplorerTreeView"]')
.assert.visible('ul[key="browser"]') .assert.visible('ul[key="browser"]')
.click('div[data-id="toggle_browser"]') .click('div[data-id="fileExplorerTreeTogglebrowser"]')
.assert.hidden('ul[key="browser"]') .assert.hidden('ul[key="browser"]')
.click('div[data-id="toggle_browser"]') .click('div[data-id="fileExplorerTreeTogglebrowser"]')
.assert.visible('ul[key="browser"]') .assert.visible('ul[key="browser"]')
}, },
'Switch Tabs using tabs icon': function (browser) { 'Switch Tabs using tabs icon': function (browser) {
browser browser
.waitForElementVisible('div[data-id="fileExplorerInit"]') .waitForElementVisible('div[data-id="sidePanelFileExplorerTreeView"]')
.switchFile('browser/3_Ballot.sol') .switchFile('browser/3_Ballot.sol')
.assert.containsText('div[title="browser/3_Ballot.sol"]', '3_Ballot.sol') .assert.containsText('div[title="browser/3_Ballot.sol"]', '3_Ballot.sol')
.click('span[class^=dropdownCaret]') .click('span[class^=dropdownCaret]')

Write Preview
Loading…
Cancel
Save