status-im/embark-area-51
2
0
Fork 0
mirror of https://github.com/status-im/embark-area-51.git synced 2025-01-13 07:24:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #493 from embark-framework/bug_fix/accounts-in-test

Browse Source 
fix calling back with accounts
This commit is contained in:
Iuri Matias 2018-06-06 14:08:18 -04:00 committed by GitHub
commit 2085b0d0c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/tests/test.js
View File

@ -137,10 +137,10 @@ class Test {
} }
self.accounts = accounts; self.accounts = accounts;
self.web3.eth.defaultAccount = accounts[0]; self.web3.eth.defaultAccount = accounts[0];
next(); next(null, accounts);
}); });
}, },
function createContractObject(next) { function createContractObject(accounts, next) {
async.each(Object.keys(self.engine.contractsManager.contracts), (contractName, eachCb) => { async.each(Object.keys(self.engine.contractsManager.contracts), (contractName, eachCb) => {
const contract = self.engine.contractsManager.contracts[contractName]; const contract = self.engine.contractsManager.contracts[contractName];
if (!self.contracts[contractName]) { if (!self.contracts[contractName]) {
@ -150,14 +150,16 @@ class Test {
{from: self.web3.eth.defaultAccount, gas: 6000000})); {from: self.web3.eth.defaultAccount, gas: 6000000}));
self.contracts[contractName].address = contract.deployedAddress; self.contracts[contractName].address = contract.deployedAddress;
eachCb(); eachCb();
}, next); }, (err) => {
next(err, accounts);
});
} }
], function (err) { ], function (err, accounts) {
if (err) { if (err) {
console.log(__('terminating due to error')); console.log(__('terminating due to error'));
return callback(err); return callback(err);
} }
callback(); callback(null, accounts);
}); });
} }

12
test_apps/test_app/test/simple_storage_spec.js
View File

@ -1,15 +1,16 @@
/*global contract, config, it, embark, assert*/ /*global contract, config, it, embark, assert, web3*/
const SimpleStorage = embark.require('Embark/contracts/SimpleStorage'); const SimpleStorage = embark.require('Embark/contracts/SimpleStorage');
let accounts;
config({ config({
contracts: { contracts: {
"SimpleStorage": { "SimpleStorage": {
args: [100], args: [100],
onDeploy: [ onDeploy: ["SimpleStorage.methods.setRegistar(web3.eth.defaultAccount).send()"]
"SimpleStorage.methods.setRegistar(web3.eth.defaultAccount).send()"
]
} }
} }
}, (err, theAccounts) => {
accounts = theAccounts;
}); });
contract("SimpleStorage", function () { contract("SimpleStorage", function () {
@ -29,9 +30,10 @@ contract("SimpleStorage", function () {
it("should set defaultAccount", async function () { it("should set defaultAccount", async function () {
let result = await SimpleStorage.methods.registar().call(); let result = await SimpleStorage.methods.registar().call();
assert.strictEqual(result, web3.eth.defaultAccount); assert.strictEqual(result, web3.eth.defaultAccount);
assert.strictEqual(accounts[0], web3.eth.defaultAccount);
}); });
it("should alias contract address", async function () { it("should alias contract address", function () {
assert.strictEqual(SimpleStorage.options.address, SimpleStorage.address); assert.strictEqual(SimpleStorage.options.address, SimpleStorage.address);
}); });