update the accounts lib each time there's a test run

pull/3517/head
yann300 2 years ago
parent 01c30a9ff6
commit 12f36183d7
  1. 6
      apps/remix-ide/src/app/tabs/test-tab.js
  2. 1
      libs/remix-tests/sol/tests_accounts.sol.ts
  3. 5
      libs/remix-ui/solidity-unit-testing/src/lib/solidity-unit-testing.tsx

@ -110,6 +110,8 @@ module.exports = class TestTab extends ViewPlugin {
*/ */
async testFromSource (content, path = 'browser/unit_test.sol') { async testFromSource (content, path = 'browser/unit_test.sol') {
const web3 = await this.call('blockchain', 'web3VM') const web3 = await this.call('blockchain', 'web3VM')
await this.testRunner.init(web3)
await this.createTestLibs()
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
const runningTest = {} const runningTest = {}
runningTest[path] = { content } runningTest[path] = { content }
@ -127,9 +129,7 @@ module.exports = class TestTab extends ViewPlugin {
resolve(result) resolve(result)
}, (url, cb) => { }, (url, cb) => {
return this.contentImport.resolveAndSave(url).then((result) => cb(null, result)).catch((error) => cb(error.message)) return this.contentImport.resolveAndSave(url).then((result) => cb(null, result)).catch((error) => cb(error.message))
}, { }, {})
web3
})
}) })
} }

@ -5,7 +5,6 @@ pragma solidity >=0.4.22 <0.9.0;
library TestsAccounts { library TestsAccounts {
function getAccount(uint index) pure public returns (address) { function getAccount(uint index) pure public returns (address) {
>accounts< >accounts<
return accounts[index];
} }
} }
` `

@ -557,6 +557,9 @@ export const SolidityUnitTesting = (props: Record<string, any>) => { // eslint-d
const compilerData = await testTab.call('compilerArtefacts', 'getCompilerAbstract', file) const compilerData = await testTab.call('compilerArtefacts', 'getCompilerAbstract', file)
await testTab.call('compilerArtefacts', 'addResolvedContract', contractAddress, compilerData) await testTab.call('compilerArtefacts', 'addResolvedContract', contractAddress, compilerData)
} }
await testTab.testRunner.init(await testTab.call('blockchain', 'web3VM'))
await testTab.createTestLibs()
testTab.testRunner.runTestSources( testTab.testRunner.runTestSources(
runningTests, runningTests,
compilerConfig, compilerConfig,
@ -568,7 +571,7 @@ export const SolidityUnitTesting = (props: Record<string, any>) => { // eslint-d
callback(error) callback(error)
}, (url: string, cb: any) => { // eslint-disable-line @typescript-eslint/no-explicit-any }, (url: string, cb: any) => { // eslint-disable-line @typescript-eslint/no-explicit-any
return testTab.contentImport.resolveAndSave(url).then((result: any) => cb(null, result)).catch((error: Error) => cb(error.message)) // eslint-disable-line @typescript-eslint/no-explicit-any return testTab.contentImport.resolveAndSave(url).then((result: any) => cb(null, result)).catch((error: Error) => cb(error.message)) // eslint-disable-line @typescript-eslint/no-explicit-any
}, { testFilePath: testFilePath, web3: await testTab.call('blockchain', 'web3VM') } }, { testFilePath: testFilePath }
) )
}).catch((error: Error) => { }).catch((error: Error) => {
console.log(error) console.log(error)

Loading…
Cancel
Save