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

Fixed linting error

Browse Source
pull/1/head
ioedeveloper 5 years ago committed by yann300
parent 2526d9d52c
commit ce9592de70
4 changed files with 81 additions and 154 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. 10
      test-browser/commands/testFunction.js
  2. 73
      test-browser/commands/testTransactionLog.js
  3. 10
      test-browser/tests/ballot.js
  4. 142
      test-browser/tests/transactionExecution.js

10
test-browser/commands/testFunction.js
Unescape View File

@ -5,7 +5,7 @@ class TestFunction extends EventEmitter {
command (txHash, expectedValue) { command (txHash, expectedValue) {
const browser = this.api const browser = this.api
const logs = {} const logs = {}
const setLog = (index, value) => logs[Object.keys(logs)[index]] = value; const setLog = (index, value) => { logs[Object.keys(logs)[index]] = value }
browser.waitForElementVisible(`*[data-id="txLogger${txHash}"]`) browser.waitForElementVisible(`*[data-id="txLogger${txHash}"]`)
.click(`*[data-id="txLogger${txHash}"]`) .click(`*[data-id="txLogger${txHash}"]`)
@ -31,10 +31,10 @@ class TestFunction extends EventEmitter {
browser.elementIdText(jsonWebElementId, (jsonElement) => { browser.elementIdText(jsonWebElementId, (jsonElement) => {
let value = jsonElement.value let value = jsonElement.value
try{ try {
value = JSON.parse(jsonElement.value) value = JSON.parse(jsonElement.value)
setLog(index, value) setLog(index, value)
}catch(e){ } catch (e) {
setLog(index, value) setLog(index, value)
} }
}) })
@ -47,7 +47,7 @@ class TestFunction extends EventEmitter {
if (!equal) { if (!equal) {
browser.assert.fail(`Expected ${expectedValue[key]} but got ${logs[key]}`) browser.assert.fail(`Expected ${expectedValue[key]} but got ${logs[key]}`)
}else{ } else {
browser.assert.ok(true, `Expected value matched returned value ${expectedValue[key]}`) browser.assert.ok(true, `Expected value matched returned value ${expectedValue[key]}`)
} }
}) })
@ -57,4 +57,4 @@ class TestFunction extends EventEmitter {
} }
} }
module.exports = TestFunction module.exports = TestFunction

73
test-browser/commands/testTransactionLog.js
Unescape View File

@ -1,73 +0,0 @@
const EventEmitter = require('events')
const deepequal = require('deep-equal')
class testTransactionLog extends EventEmitter {
command (txHash, expectedValue) {
const browser = this.api
const logs = {}
const setLog = (index, value) => logs[Object.keys(logs)[index]] = value;
browser.waitForElementPresent('.instance button[title="' + fnFullName + '"]')
.perform(function (client, done) {
client.execute(function () {
document.querySelector('#runTabView').scrollTop = document.querySelector('#runTabView').scrollHeight
}, [], function () {
if (expectedInput) {
client.setValue('#runTabView input[title="' + expectedInput.types + '"]', expectedInput.values, function () {})
}
done()
})
})
.click('.instance button[title="' + fnFullName + '"]')
.pause(500)
browser.waitForElementVisible(`*[data-id="txLogger${txHash}"]`)
.click(`*[data-id="txLogger${txHash}"]`)
.waitForElementVisible(`*[data-id="txLoggerTable${txHash}"]`)
.click(`*[data-id="txLoggerTable${txHash}"]`)
// fetch and format transaction logs as key => pair object
.elements('css selector', `*[data-shared="key_${txHash}"]`, (res) => {
res.value.forEach(function (jsonWebElement) {
const jsonWebElementId = jsonWebElement.ELEMENT
browser.elementIdText(jsonWebElementId, (jsonElement) => {
const key = jsonElement.value.trim()
logs[key] = null
})
})
})
.elements('css selector', `*[data-shared="pair_${txHash}"]`, (res) => {
res.value.forEach(function (jsonWebElement, index) {
const jsonWebElementId = jsonWebElement.ELEMENT
browser.elementIdText(jsonWebElementId, (jsonElement) => {
let value = jsonElement.value
try{
value = JSON.parse(jsonElement.value)
setLog(index, value)
}catch(e){
setLog(index, value)
}
})
})
})
browser.perform(() => {
Object.keys(expectedValue).forEach(key => {
const equal = deepequal(logs[key], expectedValue[key])
if (!equal) {
browser.assert.fail(`Expected ${expectedValue[key]} but got ${logs[key]}`)
}else{
browser.assert.ok(true, `Expected value matched returned value ${expectedValue[key]}`)
}
})
this.emit('complete')
})
return this
}
}
module.exports = testTransactionLog

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

@ -59,11 +59,11 @@ module.exports = {
.click('*[data-id="universalDappUiTitleExpander"]') .click('*[data-id="universalDappUiTitleExpander"]')
.clickFunction('delegate - transact (not payable)', {types: 'address to', values: '"0x4b0897b0513fdc7c541b6d9d7e929c4e5364d2db"'}) .clickFunction('delegate - transact (not payable)', {types: 'address to', values: '"0x4b0897b0513fdc7c541b6d9d7e929c4e5364d2db"'})
.testFunction('0xca58080c8099429caeeffe43b8104df919c2c543dceb9edf9242fa55f045c803', .testFunction('0xca58080c8099429caeeffe43b8104df919c2c543dceb9edf9242fa55f045c803',
{ {
status: '0x0 Transaction mined but execution failed', status: '0x0 Transaction mined but execution failed',
'transaction hash': '0xca58080c8099429caeeffe43b8104df919c2c543dceb9edf9242fa55f045c803', 'transaction hash': '0xca58080c8099429caeeffe43b8104df919c2c543dceb9edf9242fa55f045c803',
'decoded input': { 'address to': '0x4B0897b0513fdC7C541B6d9D7E929C4e5364D2dB' } 'decoded input': { 'address to': '0x4B0897b0513fdC7C541B6d9D7E929C4e5364D2dB' }
}) })
}, },
'Deploy and use Ballot using external web3': function (browser) { 'Deploy and use Ballot using external web3': function (browser) {

142
test-browser/tests/transactionExecution.js
Unescape View File

@ -21,25 +21,25 @@ module.exports = {
.click('#runTabView .instance div[class^="title"]') .click('#runTabView .instance div[class^="title"]')
.clickFunction('f - transact (not payable)') .clickFunction('f - transact (not payable)')
.testFunction('0x38bb944fa4709ed9e163d6c670259f97284b4defd916d512a2fcc3f35bb53e03', .testFunction('0x38bb944fa4709ed9e163d6c670259f97284b4defd916d512a2fcc3f35bb53e03',
{ {
status: '0x1 Transaction mined and execution succeed', status: '0x1 Transaction mined and execution succeed',
'transaction hash': '0x38bb944fa4709ed9e163d6c670259f97284b4defd916d512a2fcc3f35bb53e03', 'transaction hash': '0x38bb944fa4709ed9e163d6c670259f97284b4defd916d512a2fcc3f35bb53e03',
'decoded output': { "0": "uint256: 8" } 'decoded output': { '0': 'uint256: 8' }
}) })
.pause(500) .pause(500)
.checkTerminalFilter('0x12332162e2e31397dc1e07ed0a1cf08f728e9b4487c6f9ed79d2f39410c92782', '') .checkTerminalFilter('0x12332162e2e31397dc1e07ed0a1cf08f728e9b4487c6f9ed79d2f39410c92782', '')
.clickFunction('g - transact (not payable)') .clickFunction('g - transact (not payable)')
.testFunction('0xab4f794ca0b531f27fc6eace623666b440facbf20e77615a057d728c67b500f0', .testFunction('0xab4f794ca0b531f27fc6eace623666b440facbf20e77615a057d728c67b500f0',
{ {
status: '0x1 Transaction mined and execution succeed', status: '0x1 Transaction mined and execution succeed',
'transaction hash': '0xab4f794ca0b531f27fc6eace623666b440facbf20e77615a057d728c67b500f0', 'transaction hash': '0xab4f794ca0b531f27fc6eace623666b440facbf20e77615a057d728c67b500f0',
'decoded output': { 'decoded output': {
"0": "uint256: 345", '0': 'uint256: 345',
"1": "string: comment_comment_", '1': 'string: comment_comment_',
"2": "bool: true", '2': 'bool: true',
"3": "uint256: 4" '3': 'uint256: 4'
} }
}) })
.click('i[class^="clearinstance"]') .click('i[class^="clearinstance"]')
}, },
@ -55,29 +55,29 @@ module.exports = {
status: '0x1 Transaction mined and execution succeed', status: '0x1 Transaction mined and execution succeed',
'transaction hash': '0x09c6716a67f0f8c7a0ca2b3ddf59c25982da856a95aefd640b767f9b9feee39d', 'transaction hash': '0x09c6716a67f0f8c7a0ca2b3ddf59c25982da856a95aefd640b767f9b9feee39d',
'decoded output': { 'decoded output': {
"0": "bool: _b true", '0': 'bool: _b true',
"1": "uint256: _u 345", '1': 'uint256: _u 345',
"2": "int256: _i -345", '2': 'int256: _i -345',
"3": "address: _a 0xCA35b7d915458EF540aDe6068dFe2F44E8fa733c" '3': 'address: _a 0xCA35b7d915458EF540aDe6068dFe2F44E8fa733c'
} }
}) })
.clickFunction('retunValues2 - transact (not payable)', ) .clickFunction('retunValues2 - transact (not payable)')
.testFunction('0xe884953e0695399d60914af3e1ea2dad59fe41f3c0c20665c130fa40dd0fb6bf', .testFunction('0xe884953e0695399d60914af3e1ea2dad59fe41f3c0c20665c130fa40dd0fb6bf',
{ {
status: '0x1 Transaction mined and execution succeed', status: '0x1 Transaction mined and execution succeed',
'transaction hash': '0xe884953e0695399d60914af3e1ea2dad59fe41f3c0c20665c130fa40dd0fb6bf', 'transaction hash': '0xe884953e0695399d60914af3e1ea2dad59fe41f3c0c20665c130fa40dd0fb6bf',
'decoded output': { 'decoded output': {
"0": "bytes1: _b 0x12", '0': 'bytes1: _b 0x12',
"1": "bytes2: _b2 0x1223", '1': 'bytes2: _b2 0x1223',
"2": "bytes3: _b3 0x000000", '2': 'bytes3: _b3 0x000000',
"3": "bytes: _blit 0x123498", '3': 'bytes: _blit 0x123498',
"4": "bytes5: _b5 0x0432450000", '4': 'bytes5: _b5 0x0432450000',
"5": "bytes6: _b6 0x234553253200", '5': 'bytes6: _b6 0x234553253200',
"6": "string: _str this is a long string _ this is a long string _ this is a long string _ this is a long string _ this is a long string _ this is a long string _ this is a long string _ this is a long string _ this is a long string _ this is a long string _ this is a long string _ this is a long string _ this is a long string _ this is a long string _ this is a long string", '6': 'string: _str this is a long string _ this is a long string _ this is a long string _ this is a long string _ this is a long string _ this is a long string _ this is a long string _ this is a long string _ this is a long string _ this is a long string _ this is a long string _ this is a long string _ this is a long string _ this is a long string _ this is a long string',
"7": "bytes7: _b7 0x03252353253253", '7': 'bytes7: _b7 0x03252353253253',
"8": "bytes22: _b22 0x32523523532532532523532500000000000000000000", '8': 'bytes22: _b22 0x32523523532532532523532500000000000000000000',
"9": "bytes32: _b32 0x0325235325325235325235325235320000000000000000000000000000000000" '9': 'bytes32: _b32 0x0325235325325235325235325235320000000000000000000000000000000000'
} }
}).pause(500) }).pause(500)
.clickFunction('retunValues3 - transact (not payable)') .clickFunction('retunValues3 - transact (not payable)')
.testFunction('0xb4108649d5e65a4a0776d6ac98c2c356540a7e99d641705a82352a845d467eb5', .testFunction('0xb4108649d5e65a4a0776d6ac98c2c356540a7e99d641705a82352a845d467eb5',
@ -85,9 +85,9 @@ module.exports = {
status: '0x1 Transaction mined and execution succeed', status: '0x1 Transaction mined and execution succeed',
'transaction hash': '0xb4108649d5e65a4a0776d6ac98c2c356540a7e99d641705a82352a845d467eb5', 'transaction hash': '0xb4108649d5e65a4a0776d6ac98c2c356540a7e99d641705a82352a845d467eb5',
'decoded output': { 'decoded output': {
"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"]') }).click('i[class^="clearinstance"]')
}, },
@ -99,50 +99,50 @@ module.exports = {
.click('.instance:nth-of-type(2) > div > button') .click('.instance:nth-of-type(2) > div > button')
.clickFunction('inputValue1 - transact (not payable)', {types: 'uint256 _u, int256 _i, string _str', values: '"2343242", "-4324324", "string _ string _ string _ string _ string _ string _ string _ string _ string _ string _"'}) .clickFunction('inputValue1 - transact (not payable)', {types: 'uint256 _u, int256 _i, string _str', values: '"2343242", "-4324324", "string _ string _ string _ string _ string _ string _ string _ string _ string _ string _"'})
.testFunction('0xe9678b5486674a0425301a1d7e925c22cfb9f7f7ec6242697d742009f7ef5b97', .testFunction('0xe9678b5486674a0425301a1d7e925c22cfb9f7f7ec6242697d742009f7ef5b97',
{ {
status: '0x1 Transaction mined and execution succeed', status: '0x1 Transaction mined and execution succeed',
'transaction hash': '0xe9678b5486674a0425301a1d7e925c22cfb9f7f7ec6242697d742009f7ef5b97', 'transaction hash': '0xe9678b5486674a0425301a1d7e925c22cfb9f7f7ec6242697d742009f7ef5b97',
'decoded output': { 'decoded output': {
"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) .pause(500)
.clickFunction('inputValue2 - transact (not payable)', {types: 'uint256[3] _n, bytes8[4] _b8', values: '[1,2,3], ["0x1234000000000000", "0x1234000000000000","0x1234000000000000","0x1234000000000000"]'}) .clickFunction('inputValue2 - transact (not payable)', {types: 'uint256[3] _n, bytes8[4] _b8', values: '[1,2,3], ["0x1234000000000000", "0x1234000000000000","0x1234000000000000","0x1234000000000000"]'})
.testFunction('0x21724b08c3699bda8375803f8dc842194aea370f2aac284e55144b452dca321f', { .testFunction('0x21724b08c3699bda8375803f8dc842194aea370f2aac284e55144b452dca321f', {
status: '0x1 Transaction mined and execution succeed', status: '0x1 Transaction mined and execution succeed',
'transaction hash': '0x21724b08c3699bda8375803f8dc842194aea370f2aac284e55144b452dca321f', 'transaction hash': '0x21724b08c3699bda8375803f8dc842194aea370f2aac284e55144b452dca321f',
'decoded output': { 'decoded output': {
"0": "uint256[3]: _nret 1,2,3", '0': 'uint256[3]: _nret 1,2,3',
"1": "bytes8[4]: _b8ret 0x1234000000000000,0x1234000000000000,0x1234000000000000,0x1234000000000000" '1': 'bytes8[4]: _b8ret 0x1234000000000000,0x1234000000000000,0x1234000000000000,0x1234000000000000'
}, },
logs: [ logs: [
{ {
"from": "0x8c1ed7e19abaa9f23c476da86dc1577f1ef401f5", 'from': '0x8c1ed7e19abaa9f23c476da86dc1577f1ef401f5',
"topic": "0xd30981760edbf605bda8689e945f622877f230c9a77cbfbd448aa4b7d8ac6e7f", 'topic': '0xd30981760edbf605bda8689e945f622877f230c9a77cbfbd448aa4b7d8ac6e7f',
"event": "event1", 'event': 'event1',
"args": { 'args': {
"0": "-123", '0': '-123',
"1": "123", '1': '123',
"2": { '2': {
"hash": "0x9c22ff5f21f0b81b113e63f7db6da94fedef11b2119b4088b89664fb9a3cb658", 'hash': '0x9c22ff5f21f0b81b113e63f7db6da94fedef11b2119b4088b89664fb9a3cb658',
"type": "Indexed" 'type': 'Indexed'
}, },
"3": "0x12340000", '3': '0x12340000',
"4": "test _ test _ test _ test test _ test test _ test test _ test test _ test test _ test test _ test ", '4': 'test _ test _ test _ test test _ test test _ test test _ test test _ test test _ test test _ test ',
"_i": "-123", '_i': '-123',
"_u": "123", '_u': '123',
"_str": { '_str': {
"hash": "0x9c22ff5f21f0b81b113e63f7db6da94fedef11b2119b4088b89664fb9a3cb658", 'hash': '0x9c22ff5f21f0b81b113e63f7db6da94fedef11b2119b4088b89664fb9a3cb658',
"type": "Indexed" 'type': 'Indexed'
}, },
"_b": "0x12340000", '_b': '0x12340000',
"_notIndexed": "test _ test _ test _ test test _ test test _ test test _ test test _ test test _ test test _ test ", '_notIndexed': 'test _ test _ test _ test test _ test test _ test test _ test test _ test test _ test test _ test ',
"length": 5 'length': 5
} }
} }
] ]
}) })
.click('i[class^="clearinstance"]') .click('i[class^="clearinstance"]')
.end() .end()

Write Preview
Loading…
Cancel
Save