Feature/use expect event in test logs assertions #1232 (#1343)

* Add BigNumber support to expectEvent/inLogs (#1026)

* switched direct logs array check to expectEvent method in AllowanceCrowdsale.test.js

* Refactor expectEvent.inLogs function to use simple value number check

* Introduced should.be.bignumber method to compare BigNumber values

* Use expectEvent to test logs (#1232)

* Removed trailing space

(cherry picked from commit 536262f2ec)

test/crowdsale/AllowanceCrowdsale.test.js

@@ -42,14 +42,12 @@ contract('AllowanceCrowdsale', function ([_, investor, wallet, purchaser, tokenW
   describe('high-level purchase', function () {
     it('should log purchase', async function () {
       const { logs } = await this.crowdsale.sendTransaction({ value: value, from: investor });
-      expectEvent.inLogs(
-        logs,
-        'TokensPurchased',
-        {
-          purchaser: investor,
-          beneficiary: investor,
-          value: value,
-          amount: expectedTokenAmount });
+      expectEvent.inLogs(logs, 'TokensPurchased', {
+        purchaser: investor,
+        beneficiary: investor,
+        value: value,
+        amount: expectedTokenAmount
+      });
     });
 
     it('should assign tokens to sender', async function () {

test/crowdsale/Crowdsale.test.js

@@ -1,3 +1,4 @@
+const expectEvent = require('../helpers/expectEvent');
 const { assertRevert } = require('../helpers/assertRevert');
 const { ether } = require('../helpers/ether');
 const { ethGetBalance } = require('../helpers/web3');
@@ -5,7 +6,7 @@ const { ZERO_ADDRESS } = require('../helpers/constants');
 
 const BigNumber = web3.BigNumber;
 
-const should = require('chai')
+require('chai')
   .use(require('chai-bignumber')(BigNumber))
   .should();
 
@@ -82,12 +83,12 @@ contract('Crowdsale', function ([_, investor, wallet, purchaser]) {
       describe('high-level purchase', function () {
         it('should log purchase', async function () {
           const { logs } = await this.crowdsale.sendTransaction({ value: value, from: investor });
-          const event = logs.find(e => e.event === 'TokensPurchased');
-          should.exist(event);
-          event.args.purchaser.should.equal(investor);
-          event.args.beneficiary.should.equal(investor);
-          event.args.value.should.be.bignumber.equal(value);
-          event.args.amount.should.be.bignumber.equal(expectedTokenAmount);
+          expectEvent.inLogs(logs, 'TokensPurchased', {
+            purchaser: investor,
+            beneficiary: investor,
+            value: value,
+            amount: expectedTokenAmount
+          });
         });
 
         it('should assign tokens to sender', async function () {
@@ -106,12 +107,12 @@ contract('Crowdsale', function ([_, investor, wallet, purchaser]) {
       describe('low-level purchase', function () {
         it('should log purchase', async function () {
           const { logs } = await this.crowdsale.buyTokens(investor, { value: value, from: purchaser });
-          const event = logs.find(e => e.event === 'TokensPurchased');
-          should.exist(event);
-          event.args.purchaser.should.equal(purchaser);
-          event.args.beneficiary.should.equal(investor);
-          event.args.value.should.be.bignumber.equal(value);
-          event.args.amount.should.be.bignumber.equal(expectedTokenAmount);
+          expectEvent.inLogs(logs, 'TokensPurchased', {
+            purchaser: purchaser,
+            beneficiary: investor,
+            value: value,
+            amount: expectedTokenAmount
+          });
         });
 
         it('should assign tokens to beneficiary', async function () {

test/crowdsale/FinalizableCrowdsale.test.js

@@ -1,3 +1,4 @@
+const expectEvent = require('../helpers/expectEvent');
 const { advanceBlock } = require('../helpers/advanceToBlock');
 const { increaseTimeTo, duration } = require('../helpers/increaseTime');
 const { latestTime } = require('../helpers/latestTime');
@@ -6,7 +7,7 @@ const { EVMRevert } = require('../helpers/EVMRevert');
 
 const BigNumber = web3.BigNumber;
 
-const should = require('chai')
+require('chai')
   .use(require('chai-bignumber')(BigNumber))
   .should();
 
@@ -50,7 +51,6 @@ contract('FinalizableCrowdsale', function ([_, wallet, anyone]) {
   it('logs finalized', async function () {
     await increaseTimeTo(this.afterClosingTime);
     const { logs } = await this.crowdsale.finalize({ from: anyone });
-    const event = logs.find(e => e.event === 'CrowdsaleFinalized');
-    should.exist(event);
+    expectEvent.inLogs(logs, 'CrowdsaleFinalized');
   });
 });

test/crowdsale/MintedCrowdsale.behavior.js

@@ -1,8 +1,9 @@
+const expectEvent = require('../helpers/expectEvent');
 const { ethGetBalance } = require('../helpers/web3');
 
 const BigNumber = web3.BigNumber;
 
-const should = require('chai')
+require('chai')
   .use(require('chai-bignumber')(BigNumber))
   .should();
 
@@ -20,12 +21,12 @@ function shouldBehaveLikeMintedCrowdsale ([_, investor, wallet, purchaser], rate
     describe('high-level purchase', function () {
       it('should log purchase', async function () {
         const { logs } = await this.crowdsale.sendTransaction({ value: value, from: investor });
-        const event = logs.find(e => e.event === 'TokensPurchased');
-        should.exist(event);
-        event.args.purchaser.should.equal(investor);
-        event.args.beneficiary.should.equal(investor);
-        event.args.value.should.be.bignumber.equal(value);
-        event.args.amount.should.be.bignumber.equal(expectedTokenAmount);
+        expectEvent.inLogs(logs, 'TokensPurchased', {
+          purchaser: investor,
+          beneficiary: investor,
+          value: value,
+          amount: expectedTokenAmount
+        });
       });
 
       it('should assign tokens to sender', async function () {