Updating tests

This commit is contained in:
Richard Ramos 2018-03-14 15:42:04 -04:00
parent 5a1f8c93a9
commit 6426c80298
1 changed files with 21 additions and 18 deletions

View File

@ -2,7 +2,7 @@
const assert = require('assert'); const assert = require('assert');
const Embark = require('embark'); const Embark = require('embark');
let EmbarkSpec = Embark.initTests(); let EmbarkSpec = Embark.initTests();
// const web3 = EmbarkSpec.web3; let web3 = EmbarkSpec.web3;
const TestUtils = require("../utils/testUtils.js"); const TestUtils = require("../utils/testUtils.js");
const idUtils = require('../utils/identityUtils.js'); const idUtils = require('../utils/identityUtils.js');
@ -15,6 +15,7 @@ describe("Identity", function() {
this.timeout(0); this.timeout(0);
EmbarkSpec = Embark.initTests(); EmbarkSpec = Embark.initTests();
web3 = EmbarkSpec.web3;
EmbarkSpec.deployAll({ EmbarkSpec.deployAll({
"Identity": {}, "Identity": {},
@ -281,15 +282,15 @@ describe("Identity", function() {
const amountToSend = web3.utils.toWei('0.05', "ether"); const amountToSend = web3.utils.toWei('0.05', "ether");
let idBalance0 = web3.eth.getBalance(Identity.address); let idBalance0 = await web3.eth.getBalance(Identity.address);
await web3.eth.sendTransaction({from:accounts[0], to:Identity.address, value: amountToSend}) await web3.eth.sendTransaction({from:accounts[0], to:Identity.address, value: amountToSend})
let idBalance1 = web3.eth.getBalance(Identity.address); let idBalance1 = await web3.eth.getBalance(Identity.address);
assert.equal(idBalance0.toNumber() + amountToSend, idBalance1.toNumber(), Identity.address + " did not receive ether"); assert.equal(web3.utils.toBN(idBalance0).add(web3.utils.toBN(amountToSend)).toString(), web3.utils.toBN(idBalance1).toString(), Identity.address + " did not receive ether");
}); });
/*
it("ACTOR_KEY execute arbitrary transaction", async () => { it("ACTOR_KEY execute arbitrary transaction", async () => {
await Identity.methods.execute( await Identity.methods.execute(
Identity.address, Identity.address,
@ -309,14 +310,16 @@ describe("Identity", function() {
0, 0,
functionPayload) functionPayload)
.send({from: accounts[1]}); .send({from: accounts[1]});
assert.notEqual( // @rramos - Commented because of error:
await TestUtils.listenForEvent(TestContract.event.TestFunctionExecuted), // The current provider doesn't support subscriptions: Provider
undefined, /*assert.notEqual(
"Test function was not executed"); await TestUtils.listenForEvent(TestContract.events.TestFunctionExecuted),
undefined,
"Test function was not executed"); */
}); });
*/
it("MANAGEMENT_KEY cannot execute arbitrary transaction", async () => { it("MANAGEMENT_KEY cannot execute arbitrary transaction", async () => {
try { try {
await Identity.methods.execute( await Identity.methods.execute(
@ -355,20 +358,20 @@ describe("Identity", function() {
const amountToSend = web3.utils.toWei('0.01', "ether"); const amountToSend = web3.utils.toWei('0.01', "ether");
let idBalance0 = web3.eth.getBalance(Identity.address); let idBalance0 = await web3.eth.getBalance(Identity.address);
let a2Balance0 = web3.eth.getBalance(accounts[2]); let a2Balance0 = await web3.eth.getBalance(accounts[2]);
await Identity.methods.execute( await Identity.methods.execute(
accounts[2], accounts[2],
amountToSend, amountToSend,
'') '0x')
.send({from: accounts[1]}); .send({from: accounts[1]});
let idBalance1 = web3.eth.getBalance(Identity.address); let idBalance1 = await web3.eth.getBalance(Identity.address);
let a2Balance1 = web3.eth.getBalance(accounts[2]); let a2Balance1 = await web3.eth.getBalance(accounts[2]);
assert(idBalance1.toNumber, idBalance0.toNumber - amountToSend, "Contract did not send ether"); assert(web3.utils.toBN(idBalance1).toString(), web3.utils.toBN(idBalance0).sub(web3.utils.toBN(amountToSend)).toString(), "Contract did not send ether");
assert(a2Balance1.toNumber, a2Balance0.toNumber + amountToSend, accounts[2] + " did not receive ether"); assert(web3.utils.toBN(a2Balance1).toString(), web3.utils.toBN(a2Balance0).add(web3.utils.toBN(amountToSend)).toString(), accounts[2] + " did not receive ether");
}); });
it("fire ExecutionRequested(uint256 indexed executionId, address indexed to, uint256 indexed value, bytes data)", async () => { it("fire ExecutionRequested(uint256 indexed executionId, address indexed to, uint256 indexed value, bytes data)", async () => {