Merge pull request #2137 from ethereum/termTestA

README.md

@@ -105,6 +105,8 @@ To run the Selenium tests via Nightwatch:
 		- npm run nightwatch_local_staticAnalysis
 		
 		- npm run nightwatch_local_signingMessage
+
+		- npm run nightwatch_local_console
 		
 		- npm run nightwatch_local_remixd # remixd needs to be run
 		

package.json

@@ -163,6 +163,7 @@
     "nightwatch_local_staticAnalysis": "nightwatch ./test-browser/tests/staticanalysis.js --config nightwatch.js --env chrome ",
     "nightwatch_local_signingMessage": "nightwatch ./test-browser/tests/signingMessage.js --config nightwatch.js --env chrome ",
     "nightwatch_local_remixd": "nightwatch ./test-browser/tests/remix.js --config nightwatch.js --env chrome ",
+    "nightwatch_local_console": "nightwatch ./test-browser/tests/console.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/panels/terminal.js

@@ -109,16 +109,17 @@ class Terminal extends BaseApi {
   render () {
     var self = this
     if (self._view.el) return self._view.el
-    self._view.journal = yo`<div class=${css.journal}></div>`
+    self._view.journal = yo`<div id="journal" class=${css.journal}></div>`
     self._view.input = yo`
       <span class=${css.input} onload=${() => { this.focus() }} onpaste=${paste} onkeydown=${change}></span>
     `
     self._view.input.setAttribute('spellcheck', 'false')
     self._view.input.setAttribute('contenteditable', 'true')
+    self._view.input.setAttribute('id', 'terminalCliInput')
 
     self._view.input.innerText = '\n'
     self._view.cli = yo`
-      <div class="${css.cli}">
+      <div id="terminalCli" class="${css.cli}">
         <span class=${css.prompt}>${'>'}</span>
         ${self._view.input}
       </div>

test-browser/commands/executeScript.js

+const EventEmitter = require('events')
+
+class ExecuteScript extends EventEmitter {
+  command (script) {
+    this.api
+      .click('#terminalCli')
+      .keys(script)
+      .keys(this.api.Keys.ENTER)
+      .perform(() => {
+        this.emit('complete')
+      })
+    return this
+  }
+}
+
+module.exports = ExecuteScript

test-browser/commands/journalLastChild.js

+const EventEmitter = require('events')
+
+class JournalLastChild extends EventEmitter {
+  command (val) {
+    this.api
+        .waitForElementVisible('#journal div:last-child span.text-info', 10000)
+        .assert.containsText('#journal div:last-child span.text-info', val).perform(() => {
+          this.emit('complete')
+        })
+    return this
+  }
+}
+
+module.exports = JournalLastChild

test-browser/tests/console.js

+'use strict'
+var init = require('../helpers/init')
+var sauce = require('./sauce')
+
+module.exports = {
+  before: function (browser, done) {
+    init(browser, done)
+  },
+  'SimpleExecutionConsole': function (browser) {
+    browser
+    .waitForElementVisible('#terminalCli', 10000)
+    .executeScript('1+1')
+    .journalLastChild('2')
+    .end()
+  },
+  tearDown: sauce
+}