Test setup helper added (#1482)

* signing prefix added * Minor improvement * Tests changed * Successfully tested * Minor improvements * Minor improvements * Revert "Dangling commas are now required. (#1359)" This reverts commit a688977. * updates * fixes #1404 * approve failing test * suggested changes done * ISafeERC20 removed * conflict fixes * fixes #1205 * minor change * suggested changes * reviewed changes * final update
OpenZeppelin · Dec 7, 2018 · 70fd243 · 70fd243
1 parent 5caecf5
commit 70fd243
Show file tree

Hide file tree

Showing 56 changed files with 65 additions and 227 deletions.
diff --git a/test/access/Roles.test.js b/test/access/Roles.test.js
@@ -3,8 +3,7 @@ const { ZERO_ADDRESS } = require('../helpers/constants');
 
 const RolesMock = artifacts.require('RolesMock');
 
-require('chai')
-  .should();
+require('./../helpers/setup');
 
 contract('Roles', function ([_, authorized, otherAuthorized, anyone]) {
   beforeEach(async function () {

diff --git a/test/access/roles/PublicRole.behavior.js b/test/access/roles/PublicRole.behavior.js
@@ -2,8 +2,7 @@ const shouldFail = require('../../helpers/shouldFail');
 const { ZERO_ADDRESS } = require('../../helpers/constants');
 const expectEvent = require('../../helpers/expectEvent');
 
-require('chai')
-  .should();
+require('../../helpers/setup');
 
 function capitalize (str) {
   return str.replace(/\b\w/g, l => l.toUpperCase());

diff --git a/test/crowdsale/AllowanceCrowdsale.test.js b/test/crowdsale/AllowanceCrowdsale.test.js
@@ -4,11 +4,7 @@ const shouldFail = require('../helpers/shouldFail');
 const { balanceDifference } = require('../helpers/balanceDifference');
 const { ZERO_ADDRESS } = require('../helpers/constants');
 
-const BigNumber = web3.BigNumber;
-
-require('chai')
-  .use(require('chai-bignumber')(BigNumber))
-  .should();
+const { BigNumber } = require('../helpers/setup');
 
 const AllowanceCrowdsaleImpl = artifacts.require('AllowanceCrowdsaleImpl');
 const SimpleToken = artifacts.require('SimpleToken');

diff --git a/test/crowdsale/CappedCrowdsale.test.js b/test/crowdsale/CappedCrowdsale.test.js
@@ -1,11 +1,7 @@
 const { ether } = require('../helpers/ether');
 const shouldFail = require('../helpers/shouldFail');
 
-const BigNumber = web3.BigNumber;
-
-require('chai')
-  .use(require('chai-bignumber')(BigNumber))
-  .should();
+const { BigNumber } = require('../helpers/setup');
 
 const CappedCrowdsaleImpl = artifacts.require('CappedCrowdsaleImpl');
 const SimpleToken = artifacts.require('SimpleToken');

diff --git a/test/crowdsale/Crowdsale.test.js b/test/crowdsale/Crowdsale.test.js
@@ -4,11 +4,7 @@ const { balanceDifference } = require('../helpers/balanceDifference');
 const { ether } = require('../helpers/ether');
 const { ZERO_ADDRESS } = require('../helpers/constants');
 
-const BigNumber = web3.BigNumber;
-
-require('chai')
-  .use(require('chai-bignumber')(BigNumber))
-  .should();
+const { BigNumber } = require('../helpers/setup');
 
 const Crowdsale = artifacts.require('CrowdsaleMock');
 const SimpleToken = artifacts.require('SimpleToken');

diff --git a/test/crowdsale/FinalizableCrowdsale.test.js b/test/crowdsale/FinalizableCrowdsale.test.js
@@ -2,11 +2,7 @@ const expectEvent = require('../helpers/expectEvent');
 const time = require('../helpers/time');
 const shouldFail = require('../helpers/shouldFail');
 
-const BigNumber = web3.BigNumber;
-
-require('chai')
-  .use(require('chai-bignumber')(BigNumber))
-  .should();
+const { BigNumber } = require('../helpers/setup');
 
 const FinalizableCrowdsaleImpl = artifacts.require('FinalizableCrowdsaleImpl');
 const ERC20 = artifacts.require('ERC20');

diff --git a/test/crowdsale/IncreasingPriceCrowdsale.test.js b/test/crowdsale/IncreasingPriceCrowdsale.test.js
@@ -2,11 +2,7 @@ const { ether } = require('../helpers/ether');
 const time = require('../helpers/time');
 const shouldFail = require('../helpers/shouldFail');
 
-const BigNumber = web3.BigNumber;
-
-require('chai')
-  .use(require('chai-bignumber')(BigNumber))
-  .should();
+const { BigNumber } = require('../helpers/setup');
 
 const IncreasingPriceCrowdsaleImpl = artifacts.require('IncreasingPriceCrowdsaleImpl');
 const SimpleToken = artifacts.require('SimpleToken');

diff --git a/test/crowdsale/IndividuallyCappedCrowdsale.test.js b/test/crowdsale/IndividuallyCappedCrowdsale.test.js
@@ -1,11 +1,7 @@
 const { ether } = require('../helpers/ether');
 const shouldFail = require('../helpers/shouldFail');
 
-const BigNumber = web3.BigNumber;
-
-require('chai')
-  .use(require('chai-bignumber')(BigNumber))
-  .should();
+const { BigNumber } = require('../helpers/setup');
 
 const IndividuallyCappedCrowdsaleImpl = artifacts.require('IndividuallyCappedCrowdsaleImpl');
 const SimpleToken = artifacts.require('SimpleToken');

diff --git a/test/crowdsale/MintedCrowdsale.behavior.js b/test/crowdsale/MintedCrowdsale.behavior.js
@@ -1,11 +1,7 @@
 const expectEvent = require('../helpers/expectEvent');
 const { balanceDifference } = require('../helpers/balanceDifference');
 
-const BigNumber = web3.BigNumber;
-
-require('chai')
-  .use(require('chai-bignumber')(BigNumber))
-  .should();
+require('../helpers/setup');
 
 function shouldBehaveLikeMintedCrowdsale ([_, investor, wallet, purchaser], rate, value) {
   const expectedTokenAmount = rate.mul(value);

diff --git a/test/crowdsale/MintedCrowdsale.test.js b/test/crowdsale/MintedCrowdsale.test.js
@@ -2,7 +2,7 @@ const { shouldBehaveLikeMintedCrowdsale } = require('./MintedCrowdsale.behavior'
 const { ether } = require('../helpers/ether');
 const shouldFail = require('../helpers/shouldFail');
 
-const BigNumber = web3.BigNumber;
+const { BigNumber } = require('../helpers/setup');
 
 const MintedCrowdsaleImpl = artifacts.require('MintedCrowdsaleImpl');
 const ERC20Mintable = artifacts.require('ERC20Mintable');

diff --git a/test/crowdsale/PostDeliveryCrowdsale.test.js b/test/crowdsale/PostDeliveryCrowdsale.test.js
@@ -2,11 +2,7 @@ const time = require('../helpers/time');
 const shouldFail = require('../helpers/shouldFail');
 const { ether } = require('../helpers/ether');
 
-const BigNumber = web3.BigNumber;
-
-require('chai')
-  .use(require('chai-bignumber')(BigNumber))
-  .should();
+const { BigNumber } = require('../helpers/setup');
 
 const PostDeliveryCrowdsaleImpl = artifacts.require('PostDeliveryCrowdsaleImpl');
 const SimpleToken = artifacts.require('SimpleToken');

diff --git a/test/crowdsale/RefundableCrowdsale.test.js b/test/crowdsale/RefundableCrowdsale.test.js
@@ -4,11 +4,7 @@ const shouldFail = require('../helpers/shouldFail');
 const time = require('../helpers/time');
 const { ethGetBalance } = require('../helpers/web3');
 
-const BigNumber = web3.BigNumber;
-
-require('chai')
-  .use(require('chai-bignumber')(BigNumber))
-  .should();
+const { BigNumber } = require('../helpers/setup');
 
 const RefundableCrowdsaleImpl = artifacts.require('RefundableCrowdsaleImpl');
 const SimpleToken = artifacts.require('SimpleToken');

diff --git a/test/crowdsale/TimedCrowdsale.test.js b/test/crowdsale/TimedCrowdsale.test.js
@@ -2,11 +2,7 @@ const { ether } = require('../helpers/ether');
 const shouldFail = require('../helpers/shouldFail');
 const time = require('../helpers/time');
 
-const BigNumber = web3.BigNumber;
-
-require('chai')
-  .use(require('chai-bignumber')(BigNumber))
-  .should();
+const { BigNumber } = require('../helpers/setup');
 
 const TimedCrowdsaleImpl = artifacts.require('TimedCrowdsaleImpl');
 const SimpleToken = artifacts.require('SimpleToken');

diff --git a/test/cryptography/ECDSA.test.js b/test/cryptography/ECDSA.test.js
@@ -3,8 +3,7 @@ const shouldFail = require('../helpers/shouldFail');
 
 const ECDSAMock = artifacts.require('ECDSAMock');
 
-require('chai')
-  .should();
+require('../helpers/setup');
 
 const TEST_MESSAGE = web3.sha3('OpenZeppelin');
 const WRONG_MESSAGE = web3.sha3('Nope');

diff --git a/test/cryptography/MerkleProof.test.js b/test/cryptography/MerkleProof.test.js
@@ -3,8 +3,7 @@ const { keccak256, bufferToHex } = require('ethereumjs-util');
 
 const MerkleProofWrapper = artifacts.require('MerkleProofWrapper');
 
-require('chai')
-  .should();
+require('../helpers/setup');
 
 contract('MerkleProof', function () {
   beforeEach(async function () {

diff --git a/test/drafts/Counter.test.js b/test/drafts/Counter.test.js
@@ -1,9 +1,7 @@
 
 const CounterImpl = artifacts.require('CounterImpl');
 
-require('chai')
-  .use(require('chai-bignumber')(web3.BigNumber))
-  .should();
+require('../helpers/setup');
 
 const EXPECTED = [1, 2, 3, 4];
 const KEY1 = web3.sha3('key1');

diff --git a/test/drafts/ERC1046/TokenMetadata.test.js b/test/drafts/ERC1046/TokenMetadata.test.js
@@ -1,7 +1,6 @@
 const ERC20WithMetadataMock = artifacts.require('ERC20WithMetadataMock');
 
-require('chai')
-  .should();
+require('../../helpers/setup');
 
 const metadataURI = 'https://example.com';
 

diff --git a/test/drafts/ERC20Migrator.test.js b/test/drafts/ERC20Migrator.test.js
@@ -5,11 +5,7 @@ const ERC20Mock = artifacts.require('ERC20Mock');
 const ERC20Mintable = artifacts.require('ERC20Mintable');
 const ERC20Migrator = artifacts.require('ERC20Migrator');
 
-const BigNumber = web3.eth.BigNumber;
-
-require('chai')
-  .use(require('chai-bignumber')(BigNumber))
-  .should();
+require('../helpers/setup');
 
 contract('ERC20Migrator', function ([_, owner, recipient, anotherAccount]) {
   const totalSupply = 200;

diff --git a/test/drafts/SignatureBouncer.test.js b/test/drafts/SignatureBouncer.test.js
@@ -4,11 +4,7 @@ const { shouldBehaveLikePublicRole } = require('../access/roles/PublicRole.behav
 
 const SignatureBouncerMock = artifacts.require('SignatureBouncerMock');
 
-const BigNumber = web3.BigNumber;
-
-require('chai')
-  .use(require('chai-bignumber')(BigNumber))
-  .should();
+require('../helpers/setup');
 
 const UINT_VALUE = 23;
 const BYTES_VALUE = web3.toHex('test');

diff --git a/test/drafts/TokenVesting.test.js b/test/drafts/TokenVesting.test.js
@@ -4,11 +4,7 @@ const time = require('../helpers/time');
 const { ethGetBlock } = require('../helpers/web3');
 const { ZERO_ADDRESS } = require('../helpers/constants');
 
-const BigNumber = web3.BigNumber;
-
-require('chai')
-  .use(require('chai-bignumber')(BigNumber))
-  .should();
+const { BigNumber } = require('../helpers/setup');
 
 const ERC20Mintable = artifacts.require('ERC20Mintable');
 const TokenVesting = artifacts.require('TokenVesting');

diff --git a/test/examples/SampleCrowdsale.test.js b/test/examples/SampleCrowdsale.test.js
@@ -3,11 +3,7 @@ const shouldFail = require('../helpers/shouldFail');
 const time = require('../helpers/time');
 const { balanceDifference } = require('../helpers/balanceDifference');
 
-const BigNumber = web3.BigNumber;
-
-const should = require('chai')
-  .use(require('chai-bignumber')(BigNumber))
-  .should();
+const { should, BigNumber } = require('../helpers/setup');
 
 const SampleCrowdsale = artifacts.require('SampleCrowdsale');
 const SampleCrowdsaleToken = artifacts.require('SampleCrowdsaleToken');

diff --git a/test/examples/SimpleToken.test.js b/test/examples/SimpleToken.test.js
@@ -2,11 +2,7 @@ const expectEvent = require('../helpers/expectEvent');
 const { ZERO_ADDRESS } = require('../helpers/constants');
 const SimpleToken = artifacts.require('SimpleToken');
 
-const BigNumber = web3.BigNumber;
-
-require('chai')
-  .use(require('chai-bignumber')(BigNumber))
-  .should();
+require('../helpers/setup');
 
 contract('SimpleToken', function ([_, creator]) {
   beforeEach(async function () {

diff --git a/test/helpers/expectEvent.js b/test/helpers/expectEvent.js
@@ -1,11 +1,8 @@
+const { should, BigNumber } = require('./setup');
+
 const SolidityEvent = require('web3/lib/web3/event.js');
 const { ethGetTransactionReceipt } = require('./web3');
 
-const BigNumber = web3.BigNumber;
-const should = require('chai')
-  .use(require('chai-bignumber')(BigNumber))
-  .should();
-
 function inLogs (logs, eventName, eventArgs = {}) {
   const event = logs.find(function (e) {
     if (e.event === eventName) {

diff --git a/test/helpers/setup.js b/test/helpers/setup.js
@@ -0,0 +1,9 @@
+const chai = require('chai');
+
+const BigNumber = web3.BigNumber;
+const should = chai.use(require('chai-bignumber')(BigNumber)).should();
+
+module.exports = {
+  BigNumber,
+  should,
+};
diff --git a/test/helpers/shouldFail.js b/test/helpers/shouldFail.js
@@ -1,5 +1,4 @@
-const should = require('chai')
-  .should();
+const { should } = require('./setup');
 
 async function shouldFailWithMessage (promise, message) {
   try {

diff --git a/test/helpers/test/expectEvent.test.js b/test/helpers/test/expectEvent.test.js
@@ -4,10 +4,7 @@ const shouldFail = require('../shouldFail');
 const EventEmitter = artifacts.require('EventEmitter');
 const IndirectEventEmitter = artifacts.require('IndirectEventEmitter');
 
-const BigNumber = web3.BigNumber;
-const should = require('chai')
-  .use(require('chai-bignumber')(BigNumber))
-  .should();
+const { should, BigNumber } = require('../../helpers/setup');
 
 describe('expectEvent', function () {
   beforeEach(async function () {

diff --git a/test/introspection/ERC165Checker.test.js b/test/introspection/ERC165Checker.test.js
@@ -9,8 +9,7 @@ const DUMMY_UNSUPPORTED_ID = '0xbaddcafe';
 const DUMMY_UNSUPPORTED_ID_2 = '0xbaadcafe';
 const DUMMY_ACCOUNT = '0x1111111111111111111111111111111111111111';
 
-require('chai')
-  .should();
+require('../helpers/setup');
 
 contract('ERC165Checker', function () {
   beforeEach(async function () {

diff --git a/test/lifecycle/Pausable.test.js b/test/lifecycle/Pausable.test.js
@@ -4,11 +4,7 @@ const expectEvent = require('../helpers/expectEvent');
 const PausableMock = artifacts.require('PausableMock');
 const { shouldBehaveLikePublicRole } = require('../access/roles/PublicRole.behavior');
 
-const BigNumber = web3.BigNumber;
-
-require('chai')
-  .use(require('chai-bignumber')(BigNumber))
-  .should();
+require('../helpers/setup');
 
 contract('Pausable', function ([_, pauser, otherPauser, anyone, ...otherAccounts]) {
   beforeEach(async function () {

diff --git a/test/math/Math.test.js b/test/math/Math.test.js
@@ -1,10 +1,6 @@
 const MathMock = artifacts.require('MathMock');
 
-const BigNumber = web3.BigNumber;
-
-require('chai')
-  .use(require('chai-bignumber')(BigNumber))
-  .should();
+const { BigNumber } = require('../helpers/setup');
 
 contract('Math', function () {
   const min = 1234;

diff --git a/test/math/SafeMath.test.js b/test/math/SafeMath.test.js
@@ -1,12 +1,9 @@
 const shouldFail = require('../helpers/shouldFail');
 const { MAX_UINT256 } = require('../helpers/constants');
 
-const BigNumber = web3.BigNumber;
 const SafeMathMock = artifacts.require('SafeMathMock');
 
-require('chai')
-  .use(require('chai-bignumber')(BigNumber))
-  .should();
+const { BigNumber } = require('../helpers/setup');
 
 contract('SafeMath', function () {
   beforeEach(async function () {

diff --git a/test/ownership/Ownable.behavior.js b/test/ownership/Ownable.behavior.js
@@ -1,9 +1,7 @@
 const shouldFail = require('../helpers/shouldFail');
 const expectEvent = require('../helpers/expectEvent');
 const { ZERO_ADDRESS } = require('../helpers/constants');
-
-require('chai')
-  .should();
+require('./../helpers/setup');
 
 function shouldBehaveLikeOwnable (owner, [anyone]) {
   describe('as an ownable', function () {

diff --git a/test/ownership/Secondary.test.js b/test/ownership/Secondary.test.js
@@ -4,8 +4,7 @@ const { ZERO_ADDRESS } = require('../helpers/constants');
 
 const SecondaryMock = artifacts.require('SecondaryMock');
 
-require('chai')
-  .should();
+require('../helpers/setup');
 
 contract('Secondary', function ([_, primary, newPrimary, anyone]) {
   beforeEach(async function () {

diff --git a/test/payment/PaymentSplitter.test.js b/test/payment/PaymentSplitter.test.js
@@ -4,11 +4,7 @@ const send = require('./../helpers/send');
 const { ether } = require('../helpers/ether');
 const { ZERO_ADDRESS } = require('./../helpers/constants');
 
-const BigNumber = web3.BigNumber;
-
-require('chai')
-  .use(require('chai-bignumber')(BigNumber))
-  .should();
+require('../helpers/setup');
 
 const shouldFail = require('../helpers/shouldFail');
 const PaymentSplitter = artifacts.require('PaymentSplitter');