Merge pull request #1953 from ethereum/fixBrowserTest2

Fix browser tests after move to ethers v4
pull/1/head
yann300 6 years ago committed by GitHub
commit b880b8decf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 13
      package.json
  2. 12
      test-browser/tests/compiling.js

@ -27,6 +27,7 @@
"deep-equal": "^1.0.1", "deep-equal": "^1.0.1",
"ethereumjs-util": "^5.1.2", "ethereumjs-util": "^5.1.2",
"events": "^3.0.0", "events": "^3.0.0",
"ethers": "^4.0.27",
"execr": "^1.0.1", "execr": "^1.0.1",
"exorcist": "^0.4.0", "exorcist": "^0.4.0",
"fast-async": "6.3.1", "fast-async": "6.3.1",
@ -43,12 +44,12 @@
"npm-link-local": "^1.1.0", "npm-link-local": "^1.1.0",
"npm-run-all": "^4.0.2", "npm-run-all": "^4.0.2",
"onchange": "^3.2.1", "onchange": "^3.2.1",
"remix-analyzer": "0.3.5", "remix-analyzer": "0.3.6",
"remix-debug": "0.3.5", "remix-debug": "0.3.6",
"remix-lib": "0.4.5", "remix-lib": "0.4.6",
"remix-solidity": "0.3.5", "remix-solidity": "0.3.6",
"remix-tabs": "^1.0.0", "remix-tabs": "^1.0.0",
"remix-tests": "0.1.6", "remix-tests": "0.1.7",
"remixd": "0.1.8-alpha.6", "remixd": "0.1.8-alpha.6",
"request": "^2.83.0", "request": "^2.83.0",
"rimraf": "^2.6.1", "rimraf": "^2.6.1",
@ -180,7 +181,7 @@
"onchange": "onchange build/app.js -- npm-run-all lint", "onchange": "onchange build/app.js -- npm-run-all lint",
"prepublish": "mkdirp build; npm-run-all -ls downloadsolc_root build", "prepublish": "mkdirp build; npm-run-all -ls downloadsolc_root build",
"remixd": "remixd -s ./contracts --remix-ide http://127.0.0.1:8080", "remixd": "remixd -s ./contracts --remix-ide http://127.0.0.1:8080",
"selenium": "execr --silent selenium-standalone start", "selenium": "selenium-standalone start",
"selenium-install": "selenium-standalone install", "selenium-install": "selenium-standalone install",
"serve": "npx http-server .", "serve": "npx http-server .",
"serve_debugger": "npx http-server src/app/debugger/remix-debugger", "serve_debugger": "npx http-server src/app/debugger/remix-debugger",

@ -122,7 +122,7 @@ function testInputValues (browser, callback) {
}`).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], ["0x1234", "0x1234","0x1234","0x1234"]'}, {types: 'uint256[3] _n, bytes8[4] _b8', values: '[1,2,3], ["0x1234000000000000", "0x1234000000000000","0x1234000000000000","0x1234000000000000"]'},
`{ `{
"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"
@ -135,23 +135,23 @@ function testInputValues (browser, callback) {
"0": "-123", "0": "-123",
"1": "123", "1": "123",
"2": { "2": {
"indexed": true, "hash": "0x9c22ff5f21f0b81b113e63f7db6da94fedef11b2119b4088b89664fb9a3cb658",
"hash": "0x9c22ff5f21f0b81b113e63f7db6da94fedef11b2119b4088b89664fb9a3cb658" "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": {
"indexed": true, "hash": "0x9c22ff5f21f0b81b113e63f7db6da94fedef11b2119b4088b89664fb9a3cb658",
"hash": "0x9c22ff5f21f0b81b113e63f7db6da94fedef11b2119b4088b89664fb9a3cb658" "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"]').perform(() => { callback(null, browser) }) .click('i[class^="clearinstance"]').perform(() => { callback(null, browser) })
}) })
} }

Loading…
Cancel
Save