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

use nightwatch commands from tests

Browse Source
pull/3094/head
yann300 6 years ago
parent c0d04f9c14
commit 82e72ae567
16 changed files with 257 additions and 359 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. 6
      test-browser/commands/getAddressAtPosition.js
  2. 0
      test-browser/commands/goToVMTraceStep.js
  3. 4
      test-browser/commands/removeFile.js
  4. 2
      test-browser/commands/renameFile.js
  5. 3
      test-browser/commands/signMessage.js
  6. 1
      test-browser/commands/testConstantFunction.js
  7. 6
      test-browser/commands/testContracts.js
  8. 3
      test-browser/commands/testEditorValue.js
  9. 8
      test-browser/commands/verifyContracts.js
  10. 24
      test-browser/helpers/dom.js
  11. 58
      test-browser/tests/ballot.js
  12. 35
      test-browser/tests/compiling.js
  13. 170
      test-browser/tests/generalTests.js
  14. 60
      test-browser/tests/sharedFolderExplorer.js
  15. 24
      test-browser/tests/staticanalysis.js
  16. 34
      test-browser/tests/units/testRecorder.js

6
test-browser/commands/getAddressAtPositionInRunModule.js → test-browser/commands/getAddressAtPosition.js
Unescape View File

@ -1,11 +1,11 @@
const EventEmitter = require('events') const EventEmitter = require('events')
class GetAddressAtPositionInRunModule extends EventEmitter { class GetAddressAtPosition extends EventEmitter {
command (index, cb) { command (index, cb) {
this.api.perform((done) => { this.api.perform((done) => {
getAddressAtPosition(this.api, index, (pos) => { getAddressAtPosition(this.api, index, (pos) => {
cb(pos)
done() done()
cb(pos)
this.emit('complete') this.emit('complete')
}) })
}) })
@ -22,4 +22,4 @@ function getAddressAtPosition (browser, index, callback) {
}) })
} }
module.exports = GetAddressAtPositionInRunModule module.exports = GetAddressAtPosition

0
test-browser/commands/gotoVmTraceStep.js → test-browser/commands/goToVMTraceStep.js
Unescape View File

4
test-browser/commands/removeFile.js
Unescape View File

@ -13,7 +13,7 @@ class RemoveFile extends EventEmitter {
} }
function removeFile (browser, path, done) { function removeFile (browser, path, done) {
browser.execute(function (path, value) { browser.execute(function (path) {
function contextMenuClick (element) { function contextMenuClick (element) {
var evt = element.ownerDocument.createEvent('MouseEvents') var evt = element.ownerDocument.createEvent('MouseEvents')
var RIGHT_CLICK_BUTTON_CODE = 2 // the same for FF and IE var RIGHT_CLICK_BUTTON_CODE = 2 // the same for FF and IE
@ -31,8 +31,10 @@ function removeFile (browser, path, done) {
contextMenuClick(document.querySelector('[data-path="' + path + '"]')) contextMenuClick(document.querySelector('[data-path="' + path + '"]'))
}, [path], function (result) { }, [path], function (result) {
browser browser
.waitForElementVisible('#menuitemdelete', 2000)
.click('#menuitemdelete') .click('#menuitemdelete')
.pause(500) .pause(500)
.waitForElementVisible('#modal-footer-ok', 2000)
.click('#modal-footer-ok') .click('#modal-footer-ok')
.waitForElementNotPresent('[data-path="' + path + '"]') .waitForElementNotPresent('[data-path="' + path + '"]')
.perform(() => { .perform(() => {

2
test-browser/commands/renameFile.js
Unescape View File

@ -40,7 +40,7 @@ function renameFile (browser, path, newFileName, renamedPath, done) {
}) })
}) })
.click('body') // blur .click('body') // blur
.pause(500) .waitForElementVisible('#modal-footer-ok', 2000)
.click('#modal-footer-ok') .click('#modal-footer-ok')
.waitForElementNotPresent('[data-path="' + path + '"]') .waitForElementNotPresent('[data-path="' + path + '"]')
.waitForElementPresent('[data-path="' + renamedPath + '"]') .waitForElementPresent('[data-path="' + renamedPath + '"]')

3
test-browser/commands/signMessage.js
Unescape View File

@ -1,9 +1,10 @@
const EventEmitter = require('events') const EventEmitter = require('events')
class SelectContract extends EventEmitter { class SelectContract extends EventEmitter {
command (msg) { command (msg, callback) {
this.api.perform((done) => { this.api.perform((done) => {
signMsg(this.api, msg, (hash, signature) => { signMsg(this.api, msg, (hash, signature) => {
callback(hash, signature)
done() done()
this.emit('complete') this.emit('complete')
}) })

1
test-browser/commands/testConstantFunction.js
Unescape View File

@ -2,6 +2,7 @@ const EventEmitter = require('events')
class TestConstantFunction extends EventEmitter { class TestConstantFunction extends EventEmitter {
command (address, fnFullName, expectedInput, expectedOutput) { command (address, fnFullName, expectedInput, expectedOutput) {
console.log('TestConstantFunction ' + address + ' fnFullName')
this.api.perform((done) => { this.api.perform((done) => {
testConstantFunction(this.api, address, fnFullName, expectedInput, expectedOutput, () => { testConstantFunction(this.api, address, fnFullName, expectedInput, expectedOutput, () => {
done() done()

6
test-browser/commands/testContract.js → test-browser/commands/testContracts.js
Unescape View File

@ -1,6 +1,6 @@
const EventEmitter = require('events') const EventEmitter = require('events')
class TestContract extends EventEmitter { class TestContracts extends EventEmitter {
command (fileName, contractCode, compiledContractNames) { command (fileName, contractCode, compiledContractNames) {
this.api.perform((done) => { this.api.perform((done) => {
testContracts(this.api, fileName, contractCode, compiledContractNames, () => { testContracts(this.api, fileName, contractCode, compiledContractNames, () => {
@ -18,10 +18,10 @@ function testContracts (browser, fileName, contractCode, compiledContractNames,
.clearValue('#input textarea') .clearValue('#input textarea')
.addFile(fileName, contractCode) .addFile(fileName, contractCode)
.pause(1000) .pause(1000)
.verifyContract(compiledContractNames) .verifyContracts(compiledContractNames)
.perform(() => { .perform(() => {
callback() callback()
}) })
} }
module.exports = TestContract module.exports = TestContracts

3
test-browser/commands/testEditorValue.js
Unescape View File

@ -1,10 +1,9 @@
const EventEmitter = require('events') const EventEmitter = require('events')
class TestEditorValue extends EventEmitter { class TestEditorValue extends EventEmitter {
command (testvalue, callback) { command (testvalue) {
this.api.getEditorValue((value) => { this.api.getEditorValue((value) => {
this.api.assert.equal(testvalue, value) this.api.assert.equal(testvalue, value)
callback()
this.emit('complete') this.emit('complete')
}) })
return this return this

8
test-browser/commands/verifyContract.js → test-browser/commands/verifyContracts.js
Unescape View File

@ -1,9 +1,9 @@
const EventEmitter = require('events') const EventEmitter = require('events')
class VerifyContract extends EventEmitter { class VerifyContracts extends EventEmitter {
command (compiledContractNames) { command (compiledContractNames) {
this.api.perform((done) => { this.api.perform((done) => {
verifyContract(this.api, compiledContractNames, () => { verifyContracts(this.api, compiledContractNames, () => {
done() done()
this.emit('complete') this.emit('complete')
}) })
@ -29,7 +29,7 @@ function getCompiledContracts (browser, callback) {
}) })
} }
function verifyContract (browser, compiledContractNames, callback) { function verifyContracts (browser, compiledContractNames, callback) {
getCompiledContracts(browser, (result) => { getCompiledContracts(browser, (result) => {
if (result.value) { if (result.value) {
for (var contract in compiledContractNames) { for (var contract in compiledContractNames) {
@ -49,4 +49,4 @@ function verifyContract (browser, compiledContractNames, callback) {
}) })
} }
module.exports = VerifyContract module.exports = VerifyContracts

24
test-browser/helpers/dom.js
Unescape View File

@ -1,24 +0,0 @@
'use strict'
module.exports = {
listSelectorContains: listSelectorContains
}
function listSelectorContains (textsToFind, selector, browser, callback) {
browser.execute(function (selector) {
var items = document.querySelectorAll(selector)
var ret = []
for (var k = 0; k < items.length; k++) {
ret.push(items[k].innerText)
}
return ret
}, [selector], function (result) {
console.log(result.value)
for (var k in textsToFind) {
console.log('testing ' + result.value[k] + ' against ' + textsToFind[k])
browser.assert.equal(result.value[k].indexOf(textsToFind[k]) !== -1, true)
}
callback()
})
}

58
test-browser/tests/ballot.js
Unescape View File

@ -1,5 +1,4 @@
'use strict' 'use strict'
var contractHelper = require('../helpers/contracts')
var examples = require('../../src/app/editor/example-contracts') var examples = require('../../src/app/editor/example-contracts')
var init = require('../helpers/init') var init = require('../helpers/init')
var sauce = require('./sauce') var sauce = require('./sauce')
@ -25,11 +24,8 @@ function runTests (browser, testData) {
browser browser
.waitForElementVisible('#icon-panel', 10000) .waitForElementVisible('#icon-panel', 10000)
.clickLaunchIcon('solidity') .clickLaunchIcon('solidity')
.perform((client, done) => { .testContracts('Untitled.sol', sources[0]['browser/Untitled.sol'], ['Ballot'])
contractHelper.testContracts(browser, 'Untitled.sol', sources[0]['browser/Untitled.sol'], ['Ballot'], function () { .clickLaunchIcon('run')
done()
})
}).clickLaunchIcon('run')
.setValue('input[placeholder="uint8 _numProposals"]', '1') .setValue('input[placeholder="uint8 _numProposals"]', '1')
.click('#runTabView button[class^="instanceButton"]') .click('#runTabView button[class^="instanceButton"]')
.waitForElementPresent('.instance:nth-of-type(2)') .waitForElementPresent('.instance:nth-of-type(2)')
@ -43,51 +39,23 @@ function runTests (browser, testData) {
.clickLaunchIcon('debugger') .clickLaunchIcon('debugger')
.click('#jumppreviousbreakpoint') .click('#jumppreviousbreakpoint')
.pause(2000) .pause(2000)
.perform(function (client, done) { .goToVMTraceStep(59)
console.log('goToVMtraceStep')
contractHelper.goToVMtraceStep(browser, 59, () => {
done()
})
})
.pause(1000) .pause(1000)
.perform(function (client, done) { .checkVariableDebug('soliditystate', stateCheck)
contractHelper.checkDebug(browser, 'soliditystate', stateCheck, () => { .checkVariableDebug('soliditylocals', localsCheck)
done()
})
})
.perform(function (client, done) {
contractHelper.checkDebug(browser, 'soliditylocals', localsCheck, () => {
done()
})
})
.clickLaunchIcon('run') .clickLaunchIcon('run')
.click('button[class^="udappClose"]') .click('button[class^="udappClose"]')
.perform((client, done) => { .addFile('ballot.abi', { content: ballotABI })
console.log('ballot.abi') .addAtAddressInstance('0x692a70D2e424a56D2C6C27aA97D1a86395877b3B', true, false)
contractHelper.addFile(browser, 'ballot.abi', { content: ballotABI }, () => {
done()
})
})
.perform((client, done) => {
console.log('addInstance invalid checksum address 0x692a70D2e424a56D2C6C27aA97D1a86395877b3B')
contractHelper.addInstance(browser, '0x692a70D2e424a56D2C6C27aA97D1a86395877b3B', true, false, () => {
done()
})
})
.clickLaunchIcon('fileExplorers') .clickLaunchIcon('fileExplorers')
.perform((client, done) => { .addAtAddressInstance('0x692a70D2e424a56D2C6C27aA97D1a86395877b3A', true, true)
console.log('addInstance 0x692a70D2e424a56D2C6C27aA97D1a86395877b3A')
contractHelper.addInstance(browser, '0x692a70D2e424a56D2C6C27aA97D1a86395877b3A', true, true, () => {
done()
})
})
.pause(500) .pause(500)
.perform((client, done) => { .waitForElementPresent('.instance:nth-of-type(2)')
console.log('delegate - transact (not payable)') .click('.instance:nth-of-type(2) > div > button')
browser.waitForElementPresent('.instance:nth-of-type(2)').click('.instance:nth-of-type(2) > div > button').testFunction('delegate - transact (not payable)', '0xd3cd54e2f76f3993078ecf9e1b54a148def4520afc141a182293b3610bddf10f', .testFunction('delegate - transact (not payable)', '0xd3cd54e2f76f3993078ecf9e1b54a148def4520afc141a182293b3610bddf10f',
`[vm]\nfrom:0xca3...a733c\nto:Ballot.delegate(address) 0x692...77b3a\nvalue:0 wei\ndata:0x5c1...4d2db\nlogs:0\nhash:0xd3c...df10f`, `[vm]\nfrom:0xca3...a733c\nto:Ballot.delegate(address) 0x692...77b3a\nvalue:0 wei\ndata:0x5c1...4d2db\nlogs:0\nhash:0xd3c...df10f`,
{types: 'address to', values: '"0x4b0897b0513fdc7c541b6d9d7e929c4e5364d2db"'}, null, null, () => { done() }) {types: 'address to', values: '"0x4b0897b0513fdc7c541b6d9d7e929c4e5364d2db"'}, null, null)
}).end() .end()
} }
var localsCheck = { var localsCheck = {

35
test-browser/tests/compiling.js
Unescape View File

@ -1,5 +1,4 @@
'use strict' 'use strict'
var contractHelper = require('../helpers/contracts')
var init = require('../helpers/init') var init = require('../helpers/init')
var sauce = require('./sauce') var sauce = require('./sauce')
var async = require('async') var async = require('async')
@ -31,8 +30,8 @@ function runTests (browser) {
} }
function testSimpleContract (browser, callback) { function testSimpleContract (browser, callback) {
contractHelper.testContracts(browser, 'Untitled.sol', sources[0]['browser/Untitled.sol'], ['TestContract'], function () { browser.testContracts('Untitled.sol', sources[0]['browser/Untitled.sol'], ['TestContract'])
browser.clickLaunchIcon('run') .clickLaunchIcon('run')
.click('#runTabView button[class^="instanceButton"]') .click('#runTabView button[class^="instanceButton"]')
.waitForElementPresent('.instance:nth-of-type(2)') .waitForElementPresent('.instance:nth-of-type(2)')
.click('.instance:nth-of-type(2) > div > button') .click('.instance:nth-of-type(2) > div > button')
@ -43,13 +42,9 @@ function testSimpleContract (browser, callback) {
`[vm]\nfrom:0xca3...a733c\nto:TestContract.f() 0x692...77b3a\nvalue:0 wei\ndata:0x261...21ff0\nlogs:0\nhash:0xa17...523bc`, null, `[vm]\nfrom:0xca3...a733c\nto:TestContract.f() 0x692...77b3a\nvalue:0 wei\ndata:0x261...21ff0\nlogs:0\nhash:0xa17...523bc`, null,
`{ `{
"0": "uint256: 8" "0": "uint256: 8"
}`) }`)
.pause(500) .pause(500)
.perform((client, done) => { .checkTerminalFilter('0x12332162e2e31397dc1e07ed0a1cf08f728e9b4487c6f9ed79d2f39410c92782', '')
contractHelper.useFilter(browser, '0x12332162e2e31397dc1e07ed0a1cf08f728e9b4487c6f9ed79d2f39410c92782', '', () => {
done()
})
})
.testFunction('g - transact (not payable)', .testFunction('g - transact (not payable)',
'0xb1532162e2e31397dc1e07ed0a1cf08f728e9b4487c6f9ed79d2f39410c92781', '0xb1532162e2e31397dc1e07ed0a1cf08f728e9b4487c6f9ed79d2f39410c92781',
`[vm]\nfrom:0xca3...a733c\nto:TestContract.g() 0x692...77b3a\nvalue:0 wei\ndata:0xe21...79b8e\nlogs:0\nhash:0xb15...92781`, null, `{ `[vm]\nfrom:0xca3...a733c\nto:TestContract.g() 0x692...77b3a\nvalue:0 wei\ndata:0xe21...79b8e\nlogs:0\nhash:0xb15...92781`, null, `{
@ -57,13 +52,14 @@ function testSimpleContract (browser, callback) {
"1": "string: comment_comment_", "1": "string: comment_comment_",
"2": "bool: true", "2": "bool: true",
"3": "uint256: 4" "3": "uint256: 4"
}`).click('i[class^="clearinstance"]').perform(() => { callback(null, browser) }) }`)
}) .click('i[class^="clearinstance"]')
.perform(() => { callback(null, browser) })
} }
function testReturnValues (browser, callback) { function testReturnValues (browser, callback) {
contractHelper.testContracts(browser, 'returnValues.sol', sources[1]['browser/returnValues.sol'], ['testReturnValues'], function () { browser.testContracts('returnValues.sol', sources[1]['browser/returnValues.sol'], ['testReturnValues'])
browser.clickLaunchIcon('run') .clickLaunchIcon('run')
.click('#runTabView button[class^="instanceButton"]') .click('#runTabView button[class^="instanceButton"]')
.waitForElementPresent('.instance:nth-of-type(2)') .waitForElementPresent('.instance:nth-of-type(2)')
.click('.instance:nth-of-type(2) > div > button') .click('.instance:nth-of-type(2) > div > button')
@ -96,12 +92,11 @@ function testReturnValues (browser, callback) {
"0": "uint8: _en 2", "0": "uint8: _en 2",
"1": "int256[5][]: _a1 1,-45,-78,56,60,-1,42,334,-45455,-446,1,10,-5435,45,-7" "1": "int256[5][]: _a1 1,-45,-78,56,60,-1,42,334,-45455,-446,1,10,-5435,45,-7"
}`).click('i[class^="clearinstance"]').perform(() => { callback(null, browser) }) }`).click('i[class^="clearinstance"]').perform(() => { callback(null, browser) })
})
} }
function testInputValues (browser, callback) { function testInputValues (browser, callback) {
contractHelper.testContracts(browser, 'inputValues.sol', sources[2]['browser/inputValues.sol'], ['test'], function () { browser.testContracts('inputValues.sol', sources[2]['browser/inputValues.sol'], ['test'])
browser.clickLaunchIcon('run') .clickLaunchIcon('run')
.click('#runTabView button[class^="instanceButton"]') .click('#runTabView button[class^="instanceButton"]')
.waitForElementPresent('.instance:nth-of-type(2)') .waitForElementPresent('.instance:nth-of-type(2)')
.click('.instance:nth-of-type(2) > div > button') .click('.instance:nth-of-type(2) > div > button')
@ -113,7 +108,9 @@ function testInputValues (browser, callback) {
"0": "uint256: _uret 2343242", "0": "uint256: _uret 2343242",
"1": "int256: _iret -4324324", "1": "int256: _iret -4324324",
"2": "string: _strret string _ string _ string _ string _ string _ string _ string _ string _ string _ string _" "2": "string: _strret string _ string _ string _ string _ string _ string _ string _ string _ string _ string _"
}`).pause(500).testFunction('inputValue2 - transact (not payable)', }`)
.pause(500)
.testFunction('inputValue2 - transact (not payable)',
'0xd9ec6d8aa73d81755447190f52939ee3084e105b988d445a11e7ac718392ff5a', '0xd9ec6d8aa73d81755447190f52939ee3084e105b988d445a11e7ac718392ff5a',
`[vm]\nfrom:0xca3...a733c\nto:test.inputValue2(uint256[3],bytes8[4]) 0x8c1...401f5\nvalue:0 wei\ndata:0x1b7...00000\nlogs:1\nhash:0xd9e...2ff5a`, `[vm]\nfrom:0xca3...a733c\nto:test.inputValue2(uint256[3],bytes8[4]) 0x8c1...401f5\nvalue:0 wei\ndata:0x1b7...00000\nlogs:1\nhash:0xd9e...2ff5a`,
{types: 'uint256[3] _n, bytes8[4] _b8', values: '[1,2,3], ["0x1234000000000000", "0x1234000000000000","0x1234000000000000","0x1234000000000000"]'}, {types: 'uint256[3] _n, bytes8[4] _b8', values: '[1,2,3], ["0x1234000000000000", "0x1234000000000000","0x1234000000000000","0x1234000000000000"]'},
@ -146,8 +143,8 @@ function testInputValues (browser, callback) {
} }
} }
]`) ]`)
.click('i[class^="clearinstance"]').perform(() => { callback(null, browser) }) .click('i[class^="clearinstance"]')
}) .perform(() => { callback(null, browser) })
} }
// @TODO test: bytes8[3][] type as input // @TODO test: bytes8[3][] type as input

170
test-browser/tests/generalTests.js
Unescape View File

@ -1,5 +1,4 @@
'use strict' 'use strict'
var contractHelper = require('../helpers/contracts')
var init = require('../helpers/init') var init = require('../helpers/init')
var sauce = require('./sauce') var sauce = require('./sauce')
var async = require('async') var async = require('async')
@ -41,153 +40,150 @@ function runTests (browser) {
function testSimpleContract (browser, callback) { function testSimpleContract (browser, callback) {
console.log('testSimpleContract') console.log('testSimpleContract')
contractHelper.testContracts(browser, 'Untitled.sol', sources[0]['browser/Untitled.sol'], ['test1', 'test2'], function () { browser.testContracts('Untitled.sol', sources[0]['browser/Untitled.sol'], ['test1', 'test2'])
.perform(() => {
callback(null, browser) callback(null, browser)
}) })
} }
function testSuccessImport (browser, callback) { function testSuccessImport (browser, callback) {
console.log('testSuccessImport') console.log('testSuccessImport')
contractHelper.addFile(browser, 'Untitled1.sol', sources[1]['browser/Untitled1.sol'], () => { browser.addFile('Untitled1.sol', sources[1]['browser/Untitled1.sol'])
contractHelper.addFile(browser, 'Untitled2.sol', sources[1]['browser/Untitled2.sol'], () => { .addFile('Untitled2.sol', sources[1]['browser/Untitled2.sol'])
contractHelper.switchFile(browser, 'browser/Untitled1.sol', function () { .switchFile('browser/Untitled1.sol')
contractHelper.verifyContract(browser, ['test6', 'test4', 'test5'], function () { .verifyContracts(['test6', 'test4', 'test5'])
.perform(() => {
callback(null, browser) callback(null, browser)
}) })
})
})
})
} }
function testFailedImport (browser, callback) { function testFailedImport (browser, callback) {
console.log('testFailedImport') console.log('testFailedImport')
contractHelper.addFile(browser, 'Untitled3.sol', sources[2]['browser/Untitled3.sol'], () => { browser.addFile('Untitled3.sol', sources[2]['browser/Untitled3.sol'])
browser.clickLaunchIcon('solidity').assert.containsText('#compileTabView .error pre', 'Unable to import "browser/Untitled11.sol": File not found') .clickLaunchIcon('solidity')
.assert.containsText('#compileTabView .error pre', 'Unable to import "browser/Untitled11.sol": File not found')
.perform(function () { .perform(function () {
callback(null, browser) callback(null, browser)
}) })
})
} }
function addDeployLibTestFile (browser, callback) { function addDeployLibTestFile (browser, callback) {
contractHelper.addFile(browser, 'Untitled5.sol', sources[5]['browser/Untitled5.sol'], () => { browser.addFile('Untitled5.sol', sources[5]['browser/Untitled5.sol'])
.perform(() => {
callback(null, browser) callback(null, browser)
}) })
} }
function testAutoDeployLib (browser, callback) { function testAutoDeployLib (browser, callback) {
console.log('testAutoDeployLib') console.log('testAutoDeployLib')
contractHelper.verifyContract(browser, ['test'], () => { let addressRef
contractHelper.selectContract(browser, 'test', () => { browser.verifyContracts(['test'])
contractHelper.createContract(browser, '', () => { .selectContract('test')
contractHelper.getAddressAtPosition(browser, 0, (address) => { .createContract('')
console.log(address) .getAddressAtPosition(0, (address) => {
browser.waitForElementPresent('.instance:nth-of-type(2)').click('.instance:nth-of-type(2) > div > button').perform(() => { console.log('testAutoDeployLib ' + address)
contractHelper.testConstantFunction(browser, address, 'get - call', '', '0: uint256: 45', () => { callback(null, browser) }) addressRef = address
}) })
}) .waitForElementPresent('.instance:nth-of-type(2)')
}) .click('.instance:nth-of-type(2) > div > button')
.perform(() => {
browser
.testConstantFunction(addressRef, 'get - call', '', '0: uint256: 45')
.perform(() => {
callback(null, browser)
}) })
}) })
} }
function testManualDeployLib (browser, callback) { function testManualDeployLib (browser, callback) {
console.log('testManualDeployLib') console.log('testManualDeployLib')
browser.click('i[class^="clearinstance"]').pause(5000).clickLaunchIcon('settings').click('#generatecontractmetadata').perform(() => { browser.click('i[class^="clearinstance"]')
browser.clickLaunchIcon('solidity').click('#compileTabView button[title="Compile"]').perform(() => { // that should generate the JSON artefact .pause(5000)
contractHelper.verifyContract(browser, ['test'], () => { .clickLaunchIcon('settings')
contractHelper.selectContract(browser, 'lib', () => { // deploy lib .click('#generatecontractmetadata')
contractHelper.createContract(browser, '', () => { .clickLaunchIcon('solidity')
contractHelper.getAddressAtPosition(browser, 0, (address) => { .click('#compileTabView button[title="Compile"]') // that should generate the JSON artefact
console.log('address:', address) .verifyContracts(['test'])
.selectContract('lib') // deploy lib
.createContract('')
.getAddressAtPosition(0, (address) => {
console.log(address)
checkDeployShouldFail(browser, () => { checkDeployShouldFail(browser, () => {
checkDeployShouldSucceed(browser, address, () => { checkDeployShouldSucceed(browser, address, () => {
callback(null, browser) callback(null, browser)
}) })
}) })
}) })
})
})
})
})
})
} }
function checkDeployShouldFail (browser, callback) { function checkDeployShouldFail (browser, callback) {
contractHelper.switchFile(browser, 'browser/test.json', () => { let config
browser.getEditorValue((content) => { browser.switchFile('browser/test.json')
var config = JSON.parse(content) .getEditorValue((content) => {
config = JSON.parse(content)
config.deploy['VM:-'].autoDeployLib = false config.deploy['VM:-'].autoDeployLib = false
browser.setEditorValue(JSON.stringify(config), () => {
contractHelper.switchFile(browser, 'browser/Untitled5.sol', () => {
contractHelper.selectContract(browser, 'test', () => { // deploy lib
contractHelper.createContract(browser, '', () => {
browser.assert.containsText('div[class^="terminal"]', '<address> is not a valid address').perform(() => { callback() })
})
})
})
})
}) })
.perform(() => {
browser.setEditorValue(JSON.stringify(config))
}) })
.switchFile('browser/Untitled5.sol')
.selectContract('test') // deploy lib
.createContract('')
.assert.containsText('div[class^="terminal"]', '<address> is not a valid address')
.perform(() => { callback() })
} }
function checkDeployShouldSucceed (browser, address, callback) { function checkDeployShouldSucceed (browser, address, callback) {
contractHelper.switchFile(browser, 'browser/test.json', () => { let addressRef
browser.getEditorValue((content) => { let config
var config = JSON.parse(content) browser.switchFile('browser/test.json')
.getEditorValue((content) => {
config = JSON.parse(content)
config.deploy['VM:-'].autoDeployLib = false config.deploy['VM:-'].autoDeployLib = false
config.deploy['VM:-']['linkReferences']['browser/Untitled5.sol'].lib = address config.deploy['VM:-']['linkReferences']['browser/Untitled5.sol'].lib = address
browser.setEditorValue(JSON.stringify(config), () => {
contractHelper.switchFile(browser, 'browser/Untitled5.sol', () => {
contractHelper.selectContract(browser, 'test', () => { // deploy lib
contractHelper.createContract(browser, '', () => {
contractHelper.getAddressAtPosition(browser, 1, (address) => {
browser.waitForElementPresent('.instance:nth-of-type(3)')
.click('.instance:nth-of-type(3) > div > button').perform(() => {
contractHelper.testConstantFunction(browser, address, 'get - call', '', '0: uint256: 45', () => { callback(null, browser) })
})
})
})
})
}) })
.perform(() => {
browser.setEditorValue(JSON.stringify(config))
}) })
.switchFile('browser/Untitled5.sol')
.selectContract('test') // deploy lib
.createContract('')
.getAddressAtPosition(1, (address) => {
addressRef = address
}) })
.waitForElementPresent('.instance:nth-of-type(3)')
.click('.instance:nth-of-type(3) > div > button')
.perform(() => {
browser
.testConstantFunction(addressRef, 'get - call', '', '0: uint256: 45')
.perform(() => { callback() })
}) })
} }
function testSignature (browser, callback) { function testSignature (browser, callback) {
let hash, signature let hash, signature
contractHelper.signMsg(browser, 'test message', (h, s) => { browser.signMessage('test message', (h, s) => {
hash = h hash = h
signature = s signature = s
browser.assert.ok(typeof hash.value === 'string', 'type of hash.value must be String') browser.assert.ok(typeof hash.value === 'string', 'type of hash.value must be String')
browser.assert.ok(typeof signature.value === 'string', 'type of signature.value must be String') browser.assert.ok(typeof signature.value === 'string', 'type of signature.value must be String')
contractHelper.addFile(browser, 'signMassage.sol', sources[6]['browser/signMassage.sol'], () => { })
contractHelper.switchFile(browser, 'browser/signMassage.sol', () => { .addFile('signMassage.sol', sources[6]['browser/signMassage.sol'])
contractHelper.selectContract(browser, 'ECVerify', () => { // deploy lib .switchFile('browser/signMassage.sol')
contractHelper.createContract(browser, '', () => { .selectContract('ECVerify')
const instanceSelector = '.instance:nth-of-type(4)' .createContract('')
browser.waitForElementPresent(instanceSelector) .waitForElementPresent('.instance:nth-of-type(4)')
.click(instanceSelector + ' > div > button') .click('.instance:nth-of-type(4) > div > button')
.getAttribute(instanceSelector, 'id', (result) => { .getAttribute('.instance:nth-of-type(4)', 'id', (result) => {
// skip 'instance' part of e.g. 'instance0x692a70d2e424a56d2c6c27aa97d1a86395877b3a' // skip 'instance' part of e.g. 'instance0x692a70d2e424a56d2c6c27aa97d1a86395877b3a'
// const address = result.value.slice('instance'.length) const address = result.value.slice('instance'.length)
browser.clickFunction('ecrecovery - call', {types: 'bytes32 hash, bytes sig', values: `"${hash.value}","${signature.value}"`}).perform( browser.clickFunction('ecrecovery - call', {types: 'bytes32 hash, bytes sig', values: `"${hash.value}","${signature.value}"`})
() => { .verifyCallReturnValue(
callback(null, browser)
/*
contractHelper.verifyCallReturnValue(
browser,
address, address,
['0: address: 0xCA35b7d915458EF540aDe6068dFe2F44E8fa733c'], ['0: address: 0xCA35b7d915458EF540aDe6068dFe2F44E8fa733c'])
() => { callback(null, browser) } .perform(() => {
) callback(null, browser)
*/
})
})
})
})
})
}) })
}) })
} }

60
test-browser/tests/sharedFolderExplorer.js
Unescape View File

@ -1,5 +1,4 @@
'use strict' 'use strict'
var contractHelper = require('../helpers/contracts')
var init = require('../helpers/init') var init = require('../helpers/init')
var sauce = require('./sauce') var sauce = require('./sauce')
@ -52,11 +51,6 @@ function runTests (browser, testData) {
browser.end() browser.end()
return return
} }
if (browserName === 'chrome') {
console.log('do not run remixd test for ' + browserName + ': TODO to reenable later')
browser.end()
return
}
if (browserName === 'firefox') { if (browserName === 'firefox') {
console.log('do not run remixd test for ' + browserName + ': TODO to reenable later') console.log('do not run remixd test for ' + browserName + ': TODO to reenable later')
browser.end() browser.end()
@ -81,51 +75,19 @@ function runTests (browser, testData) {
.click('[data-path="localhost/folder1/contract2.sol"]') .click('[data-path="localhost/folder1/contract2.sol"]')
.click('[data-path="localhost/folder1/contract1.sol"]') // open localhost/folder1/contract1.sol .click('[data-path="localhost/folder1/contract1.sol"]') // open localhost/folder1/contract1.sol
.pause(1000) .pause(1000)
.perform(function (done) { // check the content and replace by another .testEditorValue('contract test1 { function get () returns (uint) { return 10; }}') // check the content and replace by another
browser.testEditorValue('contract test1 { function get () returns (uint) { return 10; }}', () => { .setEditorValue('contract test1Changed { function get () returns (uint) { return 10; }}')
console.log('testEditorValue') .testEditorValue('contract test1Changed { function get () returns (uint) { return 10; }}')
done() .setEditorValue('contract test1 { function get () returns (uint) { return 10; }}')
})
})
.perform(function (done) {
browser.setEditorValue('contract test1Changed { function get () returns (uint) { return 10; }}', () => {
console.log('setEditorValue')
done()
})
})
.perform(function (done) {
browser.testEditorValue('contract test1Changed { function get () returns (uint) { return 10; }}', () => {
console.log('testEditorValue')
done()
})
})
.perform(function (done) {
browser.setEditorValue('contract test1 { function get () returns (uint) { return 10; }}', () => {
console.log('setEditorValue')
done()
})
})
.click('[data-path="localhost/folder1/contract_' + browserName + '.sol"]') // rename a file and check .click('[data-path="localhost/folder1/contract_' + browserName + '.sol"]') // rename a file and check
.pause(1000) .pause(1000)
.perform(function (done) { .renameFile('localhost/folder1/contract_' + browserName + '.sol', 'renamed_contract_' + browserName + '.sol', 'localhost/folder1/renamed_contract_' + browserName + '.sol')
contractHelper.renameFile(browser, 'localhost/folder1/contract_' + browserName + '.sol', 'renamed_contract_' + browserName + '.sol',
'localhost/folder1/renamed_contract_' + browserName + '.sol', () => {
console.log('tested file renaming')
done()
})
})
.pause(1000) .pause(1000)
.perform(function (done) { // remove a file and check .removeFile('localhost/folder1/contract_' + browserName + '_toremove.sol')
contractHelper.removeFile(browser, 'localhost/folder1/contract_' + browserName + '_toremove.sol', () => {
console.log('tested file removing')
done()
})
})
.perform(function (done) { .perform(function (done) {
testImportFromRemixd(browser, () => { done() }) testImportFromRemixd(browser, () => { done() })
}) })
.perform(function () { .clickLaunchIcon('fileExplorers').click('[data-path="localhost"]') // collapse and expand
browser.clickLaunchIcon('fileExplorers').click('[data-path="localhost"]') // collapse and expand
.waitForElementNotVisible('[data-path="localhost/folder1"]') .waitForElementNotVisible('[data-path="localhost/folder1"]')
.click('[data-path="localhost"]') .click('[data-path="localhost"]')
.waitForElementVisible('[data-path="localhost/folder1"]') .waitForElementVisible('[data-path="localhost/folder1"]')
@ -138,7 +100,6 @@ function runTests (browser, testData) {
.clickLaunchIcon('pluginManager') .clickLaunchIcon('pluginManager')
.click('#pluginManager article[id="remixPluginManagerListItem_remixd"] button') .click('#pluginManager article[id="remixPluginManagerListItem_remixd"] button')
.end() .end()
})
} }
function testImportFromRemixd (browser, callback) { function testImportFromRemixd (browser, callback) {
@ -150,9 +111,6 @@ function testImportFromRemixd (browser, callback) {
.waitForElementVisible('[data-path="localhost/src/gmbh/company.sol"]', 100000) .waitForElementVisible('[data-path="localhost/src/gmbh/company.sol"]', 100000)
.click('[data-path="localhost/src/gmbh/company.sol"]') .click('[data-path="localhost/src/gmbh/company.sol"]')
.pause(1000) .pause(1000)
.perform(() => { .verifyContracts(['Assets', 'gmbh'])
contractHelper.verifyContract(browser, ['Assets', 'gmbh'], function () { .perform(() => { callback() })
callback()
})
})
} }

24
test-browser/tests/staticanalysis.js
Unescape View File

@ -1,8 +1,6 @@
'use strict' 'use strict'
var contractHelper = require('../helpers/contracts')
var init = require('../helpers/init') var init = require('../helpers/init')
var sauce = require('./sauce') var sauce = require('./sauce')
var dom = require('../helpers/dom')
var sources = [ var sources = [
{ {
@ -36,12 +34,11 @@ function runTests (browser) {
browser browser
.waitForElementVisible('#icon-panel', 10000) .waitForElementVisible('#icon-panel', 10000)
.clickLaunchIcon('solidity') .clickLaunchIcon('solidity')
contractHelper.testContracts(browser, 'Untitled.sol', sources[0]['browser/Untitled.sol'], ['TooMuchGas', 'test1', 'test2'], function () { .testContracts('Untitled.sol', sources[0]['browser/Untitled.sol'], ['TooMuchGas', 'test1', 'test2'])
browser
.clickLaunchIcon('solidityStaticAnalysis') .clickLaunchIcon('solidityStaticAnalysis')
.click('#staticanalysisView button') .click('#staticanalysisView button')
.waitForElementPresent('#staticanalysisresult .staticAnalysisWarning', 2000, true, function () { .waitForElementPresent('#staticanalysisresult .staticAnalysisWarning', 2000, true, function () {
dom.listSelectorContains(['browser/Untitled.sol:2:33:Use of tx.origin', listSelectorContains(['browser/Untitled.sol:2:33:Use of tx.origin',
'Fallback function of contract TooMuchGas requires too much gas', 'Fallback function of contract TooMuchGas requires too much gas',
'TooMuchGas.() : Variables have very similar names test and test1.'], 'TooMuchGas.() : Variables have very similar names test and test1.'],
'#staticanalysisresult .staticAnalysisWarning', '#staticanalysisresult .staticAnalysisWarning',
@ -50,5 +47,22 @@ function runTests (browser) {
} }
) )
}) })
}
function listSelectorContains (textsToFind, selector, browser, callback) {
browser.execute(function (selector) {
var items = document.querySelectorAll(selector)
var ret = []
for (var k = 0; k < items.length; k++) {
ret.push(items[k].innerText)
}
return ret
}, [selector], function (result) {
console.log(result.value)
for (var k in textsToFind) {
console.log('testing ' + result.value[k] + ' against ' + textsToFind[k])
browser.assert.equal(result.value[k].indexOf(textsToFind[k]) !== -1, true)
}
callback()
}) })
} }

34
test-browser/tests/units/testRecorder.js
Unescape View File

@ -1,5 +1,4 @@
'use strict' 'use strict'
var contractHelper = require('../../helpers/contracts')
module.exports = { module.exports = {
'@disabled': true, // run by compiling.j '@disabled': true, // run by compiling.j
@ -7,8 +6,7 @@ module.exports = {
return sources return sources
}, },
test: function (browser, callback) { test: function (browser, callback) {
contractHelper.addFile(browser, 'scenario.json', {content: records}, () => { browser.addFile('scenario.json', {content: records})
browser
.clickLaunchIcon('run') .clickLaunchIcon('run')
.click('div[class^="cardContainer"] i[class^="arrow"]') .click('div[class^="cardContainer"] i[class^="arrow"]')
.click('#runTabView .runtransaction') .click('#runTabView .runtransaction')
@ -20,27 +18,17 @@ module.exports = {
.clickFunction('getAddress - call') .clickFunction('getAddress - call')
.clickFunction('getFromLib - call') .clickFunction('getFromLib - call')
.waitForElementPresent('div[class^="contractActionsContainer"] div[class^="value"] ul') .waitForElementPresent('div[class^="contractActionsContainer"] div[class^="value"] ul')
.perform((client, done) => { .verifyCallReturnValue('0x35ef07393b57464e93deb59175ff72e6499450cf', ['0: uint256: 1', '0: uint256: 3456', '0: address: 0x35eF07393b57464e93dEB59175fF72E6499450cF'])
contractHelper.verifyCallReturnValue(browser, '0x35ef07393b57464e93deb59175ff72e6499450cf', ['0: uint256: 1', '0: uint256: 3456', '0: address: 0x35eF07393b57464e93dEB59175fF72E6499450cF'], () => {
done()
})
})
.click('i[class^="clearinstance"]') .click('i[class^="clearinstance"]')
.perform((client, done) => { .testContracts('testRecorder.sol', sources[0]['browser/testRecorder.sol'], ['testRecorder'])
contractHelper.testContracts(browser, 'testRecorder.sol', sources[0]['browser/testRecorder.sol'], ['testRecorder'], function () { .createContract('12')
done()
})
})
.perform((client, done) => {
contractHelper.createContract(browser, '12', function () {
done()
})
})
.waitForElementPresent('.instance:nth-of-type(2)') .waitForElementPresent('.instance:nth-of-type(2)')
.click('.instance:nth-of-type(2) > div > button') .click('.instance:nth-of-type(2) > div > button')
.perform((client, done) => { .clickFunction('set - transact (not payable)', {types: 'uint256 _p', values: '34'})
browser.clickFunction('set - transact (not payable)', {types: 'uint256 _p', values: '34'}) .click('i.savetransaction')
.click('i.savetransaction').modalFooterOKClick().getEditorValue(function (result) { .modalFooterOKClick()
.getEditorValue(function (result) {
var parsed = JSON.parse(result) var parsed = JSON.parse(result)
browser.assert.equal(JSON.stringify(parsed.transactions[0].record.parameters), JSON.stringify(scenario.transactions[0].record.parameters)) browser.assert.equal(JSON.stringify(parsed.transactions[0].record.parameters), JSON.stringify(scenario.transactions[0].record.parameters))
browser.assert.equal(JSON.stringify(parsed.transactions[0].record.name), JSON.stringify(scenario.transactions[0].record.name)) browser.assert.equal(JSON.stringify(parsed.transactions[0].record.name), JSON.stringify(scenario.transactions[0].record.name))
@ -52,12 +40,10 @@ module.exports = {
browser.assert.equal(JSON.stringify(parsed.transactions[1].record.name), JSON.stringify(scenario.transactions[1].record.name)) browser.assert.equal(JSON.stringify(parsed.transactions[1].record.name), JSON.stringify(scenario.transactions[1].record.name))
browser.assert.equal(JSON.stringify(parsed.transactions[1].record.type), JSON.stringify(scenario.transactions[1].record.type)) browser.assert.equal(JSON.stringify(parsed.transactions[1].record.type), JSON.stringify(scenario.transactions[1].record.type))
browser.assert.equal(JSON.stringify(parsed.transactions[1].record.from), JSON.stringify(scenario.transactions[1].record.from)) browser.assert.equal(JSON.stringify(parsed.transactions[1].record.from), JSON.stringify(scenario.transactions[1].record.from))
done()
}) })
}).perform(() => { .perform(() => {
callback() callback()
}) })
})
} }
} }

Write Preview
Loading…
Cancel
Save