Merge pull request #414 from ethereum/fixtests

Fix tests
pull/1/head
chriseth 8 years ago committed by GitHub
commit bf7258a2d4
  1. 2
      test-browser/tests/ballot.js
  2. 2
      test-browser/tests/compiling.js
  3. 2
      test-browser/tests/simpleContract.js
  4. 4
      test-browser/tests/staticanalysis.js

@ -26,7 +26,7 @@ module.exports = {
function runTests (browser, testData) { function runTests (browser, testData) {
browser browser
.waitForElementVisible('.newFile', 10000) .waitForElementVisible('.newFile', 10000)
contractHelper.testContracts(browser, sources.sources.Untitled, ['Ballot'], function () { contractHelper.testContracts(browser, sources.sources.Untitled, ['Untitled:Ballot'], function () {
browser.end() browser.end()
}) })
} }

@ -26,7 +26,7 @@ module.exports = {
function runTests (browser) { function runTests (browser) {
browser browser
.waitForElementVisible('.newFile', 10000) .waitForElementVisible('.newFile', 10000)
contractHelper.testContracts(browser, sources.sources.Untitled, ['TestContract'], function () { contractHelper.testContracts(browser, sources.sources.Untitled, ['Untitled:TestContract'], function () {
browser.click('.create .constructor .call') browser.click('.create .constructor .call')
.waitForElementPresent('.instance .call[title="f"]') .waitForElementPresent('.instance .call[title="f"]')
.click('.instance .call[title="f"]') .click('.instance .call[title="f"]')

@ -25,7 +25,7 @@ module.exports = {
function runTests (browser) { function runTests (browser) {
browser browser
.waitForElementVisible('.newFile', 10000) .waitForElementVisible('.newFile', 10000)
contractHelper.testContracts(browser, sources.sources.Untitled, ['test1', 'test2'], function () { contractHelper.testContracts(browser, sources.sources.Untitled, ['Untitled:test1', 'Untitled:test2'], function () {
browser.end() browser.end()
}) })
} }

@ -32,13 +32,13 @@ module.exports = {
function runTests (browser) { function runTests (browser) {
browser browser
.waitForElementVisible('.newFile', 10000) .waitForElementVisible('.newFile', 10000)
contractHelper.testContracts(browser, sources.sources.Untitled, ['TooMuchGas', 'test1', 'test2'], function () { contractHelper.testContracts(browser, sources.sources.Untitled, ['Untitled:TooMuchGas', 'Untitled:test1', 'Untitled:test2'], function () {
browser browser
.click('.staticanalysisView') .click('.staticanalysisView')
.click('#staticanalysisView button') .click('#staticanalysisView button')
.waitForElementPresent('#staticanalysisresult .warning', 2000, true, function () { .waitForElementPresent('#staticanalysisresult .warning', 2000, true, function () {
dom.listSelectorContains(['Untitled:1:34: use of tx.origin', dom.listSelectorContains(['Untitled:1:34: use of tx.origin',
'Fallback function of contract TooMuchGas requires too much gas'], 'Fallback function of contract Untitled:TooMuchGas requires too much gas'],
'#staticanalysisresult .warning span', '#staticanalysisresult .warning span',
browser, function () { browser, function () {
browser.end() browser.end()

Loading…
Cancel
Save