Merge branch 'master' of https://github.com/ethereum/remix-ide into terminal-e2e-tests

package.json

@@ -175,6 +175,7 @@
     "nightwatch_local_terminal": "nightwatch ./test-browser/tests/terminal.js --config nightwatch.js --env chrome ",
     "nightwatch_local_gist": "nightwatch ./test-browser/tests/gist.js --config nightwatch.js --env chrome ",
     "nightwatch_local_workspace": "nightwatch ./test-browser/tests/workspace.js --config nightwatch.js --env chrome ",
+    "nightwatch_local_defaultLayout": "nightwatch ./test-browser/tests/defaultLayout.js --config nightwatch.js --env chrome ",
     "onchange": "onchange build/app.js -- npm-run-all lint",
     "prepublish": "mkdirp build; npm-run-all -ls downloadsolc_root build",
     "remixd": "remixd -s ./contracts --remix-ide http://127.0.0.1:8080",

src/app.js

@@ -141,21 +141,21 @@ class App {
     if (self._view.el) return self._view.el
     // not resizable
     self._view.iconpanel = yo`
-      <div id="icon-panel" class="${css.iconpanel} bg-light">
+      <div id="icon-panel" data-id="remixIdeIconPanel" class="${css.iconpanel} bg-light">
       ${''}
       </div>
     `
 
     // center panel, resizable
     self._view.sidepanel = yo`
-      <div 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>
     `
 
     // handle the editor + terminal
     self._view.mainpanel = yo`
-      <div id="main-panel" class=${css.mainpanel}>
+      <div id="main-panel" data-id="remixIdeMainPanel" class=${css.mainpanel}>
         ${''}
       </div>
     `

src/app/components/main-panel.js

@@ -26,7 +26,7 @@ export class MainPanel extends AbstractPanel {
 
   render () {
     return yo`
-      <div class=${css.pluginsContainer}>
+      <div class=${css.pluginsContainer} data-id="mainPanelPluginsContainer">
         ${this.view}
       </div>`
   }

src/app/components/side-panel.js

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

src/app/components/vertical-icons.js

@@ -227,6 +227,7 @@ export class VerticalIcons extends Plugin {
         this.appManager.ensureActivated('home')
       }}"
       plugin="home" title="Home"
+      data-id="verticalIconsHomeIcon"
     >
     <svg id="Ebene_2" data-name="Ebene 2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 105 100">
       <title>remix_logo1</title>
@@ -238,7 +239,7 @@ export class VerticalIcons extends Plugin {
     </div>`
 
     this.iconKind['fileexplorer'] = yo`
-    <div id='fileExplorerIcons'>
+    <div id='fileExplorerIcons' data-id="verticalIconsFileExplorerIcons">
     </div>
     `
 
@@ -273,7 +274,7 @@ export class VerticalIcons extends Plugin {
     `
 
     this.iconKind['settings'] = yo`
-    <div id='settingsIcons'>
+    <div id='settingsIcons' data-id="verticalIconsSettingsIcons">
     </div>
     `
 

src/app/panels/file-panel.js

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

src/app/panels/terminal.js

@@ -123,14 +123,14 @@ class Terminal extends Plugin {
 
     self._view.input.innerText = '\n'
     self._view.cli = yo`
-      <div id="terminalCli" class="${css.cli}">
+      <div id="terminalCli" data-id="terminalCli" class="${css.cli}">
         <span class=${css.prompt}>${'>'}</span>
         ${self._view.input}
       </div>
     `
     self._view.icon = yo`
       <i onmouseenter=${hover} onmouseleave=${hover} onmousedown=${minimize}
-      class="btn btn-secondary btn-sm align-items-center ${css.toggleTerminal} fas fa-angle-double-down"></i>`
+      class="btn btn-secondary btn-sm align-items-center ${css.toggleTerminal} fas fa-angle-double-down" data-id="terminalToggleIcon"></i>`
     self._view.dragbar = yo`
       <div onmousedown=${mousedown} class=${css.dragbarHorizontal}></div>`
 
@@ -146,7 +146,7 @@ class Terminal extends Plugin {
     self._view.bar = yo`
       <div class="${css.bar}">
         ${self._view.dragbar}
-        <div class="${css.menu} border-top border-dark bg-light">
+        <div class="${css.menu} border-top border-dark bg-light" data-id="terminalToggleMenu">
           ${self._view.icon}
           <div class=${css.clear} id="clearConsole" onclick=${clear}>
             <i class="fas fa-ban" aria-hidden="true" title="Clear console"
@@ -177,9 +177,9 @@ class Terminal extends Plugin {
       </div>
     `
     self._view.term = yo`
-      <div class="${css.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()}
-        <div class="bg-secondary" style="
+        <div class="bg-secondary" data-id="terminalContainerDisplay" style="
           position: absolute;
           height: 100%;
           width: 100%;

src/app/ui/TreeView.js

@@ -91,6 +91,7 @@ class TreeView {
       var list = yo`<ul key=${keyPath} class=${css.ul_tv}>${children}</ul>`
       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.setAttribute('data-id', `treeViewToggle${keyPath}`)
       label.onclick = function () {
         self.expand(keyPath)
       }

src/app/ui/landing-page/landing-page.js

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

test-browser/commands/checkElementStyle.js

@@ -0,0 +1,24 @@
+const EventEmitter = require('events')
+
+class checkElementStyle extends EventEmitter {
+  command (cssSelector, styleProperty, expectedResult) {
+    this.api.perform((done) => {
+      checkStyle(this.api, cssSelector, styleProperty, expectedResult, () => {
+        done()
+        this.emit('complete')
+      })
+    })
+    return this
+  }
+}
+
+function checkStyle (browser, cssSelector, styleProperty, expectedResult, callback) {
+  browser.execute(function (cssSelector, styleProperty) {
+    return window.getComputedStyle(document.querySelector(cssSelector)).getPropertyValue(styleProperty)
+  }, [cssSelector, styleProperty], function (result) {
+    browser.assert.equal(result.value, expectedResult)
+    callback()
+  })
+}
+
+module.exports = checkElementStyle

test-browser/commands/journalLastChildIncludes.js

@@ -10,6 +10,7 @@ class JournalLastChildIncludes extends EventEmitter {
     .getText('#journal > div:last-child', (result) => {
       console.log('JournalLastChildIncludes', result.value)
       if (result.value.indexOf(val) === -1) return this.api.assert.fail(`wait for ${val} in ${result.value}`)
+      else this.api.assert.ok(`<#journal > div:last-child> contains ${val}.`)
       this.emit('complete')
     })
     return this

test-browser/tests/defaultLayout.js

@@ -0,0 +1,78 @@
+'use strict'
+const init = require('../helpers/init')
+const sauce = require('./sauce')
+
+module.exports = {
+  before: function (browser, done) {
+    init(browser, done, 'http://127.0.0.1:8080', false)
+  },
+  'Loads Icon\'s Panel': function (browser) {
+    browser.waitForElementVisible('div[data-id="remixIdeIconPanel"]', 10000)
+    .waitForElementVisible('div[data-id="verticalIconsHomeIcon"]')
+    .waitForElementVisible('div[plugin="fileExplorers"]')
+    .waitForElementVisible('div[plugin="pluginManager"]')
+    .waitForElementVisible('div[plugin="settings"]')
+  },
+
+  'Loads Side Panel': function (browser) {
+    browser.waitForElementVisible('div[data-id="remixIdeSidePanel"]')
+    .assert.containsText('h6[data-id="sidePanelSwapitTitle"]', 'FILE EXPLORERS')
+    .waitForElementVisible('div[data-id="filePanelFileExplorerTree"]')
+    .waitForElementVisible('li[key="browser/4_Ballot_test.sol"]')
+  },
+
+  'Loads Main View': function (browser) {
+    browser.waitForElementVisible('div[data-id="mainPanelPluginsContainer"]')
+    .waitForElementVisible('div[data-id="landingPageHomeContainer"]')
+    .waitForElementVisible('div[data-id="landingPageHpSections"]')
+    .waitForElementVisible('div[data-id="terminalContainer"]')
+  },
+
+  'Loads terminal': function (browser) {
+    browser
+    .waitForElementVisible('div[data-id="terminalCli"]', 10000)
+    .journalLastChildIncludes('Welcome to Remix')
+  },
+
+  'Toggles Side Panel': function (browser) {
+    browser.waitForElementVisible('div[data-id="remixIdeSidePanel"]')
+    .assert.containsText('h6[data-id="sidePanelSwapitTitle"]', 'FILE EXPLORERS')
+    .clickLaunchIcon('fileExplorers')
+    .assert.hidden('div[data-id="remixIdeSidePanel"]')
+    .clickLaunchIcon('fileExplorers')
+    .assert.visible('div[data-id="remixIdeSidePanel"]')
+    .assert.containsText('h6[data-id="sidePanelSwapitTitle"]', 'FILE EXPLORERS')
+  },
+
+  'Toggles Terminal': function (browser) {
+    browser.waitForElementVisible('div[data-id="terminalContainer"]')
+    .assert.visible('div[data-id="terminalContainerDisplay"]')
+    .click('i[data-id="terminalToggleIcon"]')
+    .checkElementStyle('div[data-id="terminalToggleMenu"]', 'height', '35px')
+    .click('i[data-id="terminalToggleIcon"]')
+    .assert.visible('div[data-id="terminalContainerDisplay"]')
+  },
+
+  'Toggles File Explorer Browser': function (browser) {
+    browser
+    .waitForElementVisible('div[data-id="filePanelFileExplorerTree"]')
+    .assert.visible('ul[key="browser"]')
+    .click('div[data-id="treeViewTogglebrowser"]')
+    .assert.hidden('ul[key="browser"]')
+    .click('div[data-id="treeViewTogglebrowser"]')
+    .assert.visible('ul[key="browser"]')
+  },
+
+  'Switch Tabs using tabs icon': function (browser) {
+    browser
+    .waitForElementVisible('div[data-id="filePanelFileExplorerTree"]')
+    .switchFile('browser/3_Ballot.sol')
+    .assert.containsText('div[title="browser/3_Ballot.sol"]', '3_Ballot.sol')
+    .click('span[class^=dropdownCaret]')
+    .click('#homeItem')
+    .assert.containsText('div[title="home"]', 'Home')
+    .end()
+  },
+
+  tearDown: sauce
+}