Commit 613e1602 authored by yann300's avatar yann300

add comment + misc

parent 4d6a2e45
...@@ -16,22 +16,20 @@ gatherCompilationResults(function (error, data) { ...@@ -16,22 +16,20 @@ gatherCompilationResults(function (error, data) {
function gatherCompilationResults (callback) { function gatherCompilationResults (callback) {
var compilationResult = {} var compilationResult = {}
fs.readdir('./test-browser/tests', 'utf8', function (error, data) { fs.readdir('./test-browser/tests', 'utf8', function (error, filenames) {
if (error) { if (error) {
console.log(error) console.log(error)
process.exit(1) process.exit(1)
} else { } else {
data.map(function (item, i) { filenames.map(function (item, i) {
var testDef = require('../test-browser/tests/' + item) var testDef = require('../test-browser/tests/' + item)
for (var k in testDef) { if ('@sources' in testDef) {
if (k === '@Sources') { var source = testDef['@sources']()
var source = testDef[k]()
var result = compile(source, 1) var result = compile(source, 1)
compilationResult[result.key] = result compilationResult[result.key] = result
result = compile(source, 0) result = compile(source, 0)
compilationResult[result.key] = result compilationResult[result.key] = result
} }
}
}) })
callback(null, compilationResult) callback(null, compilationResult)
......
...@@ -12,7 +12,7 @@ function Editor (loadingFromGist, storage) { ...@@ -12,7 +12,7 @@ function Editor (loadingFromGist, storage) {
var SOL_CACHE_FILE = null var SOL_CACHE_FILE = null
var editor = ace.edit('input') var editor = ace.edit('input')
document.getElementById('input').editor = editor document.getElementById('input').editor = editor // required to access the editor during tests
var sessions = {} var sessions = {}
var sourceAnnotations = [] var sourceAnnotations = []
......
...@@ -3,5 +3,5 @@ ...@@ -3,5 +3,5 @@
* *
*/ */
console.log('applying test mode') console.log('applying test mode')
document.getElementById('input').editor.setBehavioursEnabled(false) document.getElementById('input').editor.setBehavioursEnabled(false) // disable bracket auto-match (i.e. automatic injection of closing brackets and other things), so we can enter raw source code.
console.log('test mode applied') console.log('test mode applied')
...@@ -7,7 +7,6 @@ module.exports = { ...@@ -7,7 +7,6 @@ module.exports = {
function checkCompiledContracts (browser, compiled, callback) { function checkCompiledContracts (browser, compiled, callback) {
browser.elements('css selector', '.udapp .contract .title', function (elements) { browser.elements('css selector', '.udapp .contract .title', function (elements) {
console.log(JSON.stringify(elements))
elements.value.map(function (item, i) { elements.value.map(function (item, i) {
browser.elementIdText(item.ELEMENT, function (text) { browser.elementIdText(item.ELEMENT, function (text) {
browser.assert.equal(text.value.split('\n')[0], compiled[i]) browser.assert.equal(text.value.split('\n')[0], compiled[i])
...@@ -22,6 +21,6 @@ function testContracts (browser, contractCode, compiledContractNames, callback) ...@@ -22,6 +21,6 @@ function testContracts (browser, contractCode, compiledContractNames, callback)
.clearValue('#input textarea') .clearValue('#input textarea')
.click('.newFile') .click('.newFile')
.setValue('#input textarea', contractCode, function () {}) .setValue('#input textarea', contractCode, function () {})
.waitForElementPresent('.contract .create', 3000000) .waitForElementPresent('.contract .create', 2000)
checkCompiledContracts(browser, compiledContractNames, callback) checkCompiledContracts(browser, compiledContractNames, callback)
} }
...@@ -13,7 +13,7 @@ module.exports = { ...@@ -13,7 +13,7 @@ module.exports = {
before: function (browser, done) { before: function (browser, done) {
init(browser, done) init(browser, done)
}, },
'@Sources': function () { '@sources': function () {
return sources return sources
}, },
'Ballot': function (browser) { 'Ballot': function (browser) {
......
...@@ -12,7 +12,7 @@ module.exports = { ...@@ -12,7 +12,7 @@ module.exports = {
before: function (browser, done) { before: function (browser, done) {
init(browser, done) init(browser, done)
}, },
'@Sources': function () { '@sources': function () {
return sources return sources
}, },
'Simple Contract': function (browser) { 'Simple Contract': function (browser) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment