From 70fd243e3b7b38e761fd0581ed00537356ed6e41 Mon Sep 17 00:00:00 2001 From: Aniket <30843294+Aniket-Engg@users.noreply.github.com> Date: Fri, 7 Dec 2018 22:02:48 +0530 Subject: [PATCH] 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 a6889776f46adca374b6ebf014aa7b0038112a9d. * updates * fixes #1404 * approve failing test * suggested changes done * ISafeERC20 removed * conflict fixes * fixes #1205 * minor change * suggested changes * reviewed changes * final update --- test/access/Roles.test.js | 3 +-- test/access/roles/PublicRole.behavior.js | 3 +-- test/crowdsale/AllowanceCrowdsale.test.js | 6 +----- test/crowdsale/CappedCrowdsale.test.js | 6 +----- test/crowdsale/Crowdsale.test.js | 6 +----- test/crowdsale/FinalizableCrowdsale.test.js | 6 +----- test/crowdsale/IncreasingPriceCrowdsale.test.js | 6 +----- test/crowdsale/IndividuallyCappedCrowdsale.test.js | 6 +----- test/crowdsale/MintedCrowdsale.behavior.js | 6 +----- test/crowdsale/MintedCrowdsale.test.js | 2 +- test/crowdsale/PostDeliveryCrowdsale.test.js | 6 +----- test/crowdsale/RefundableCrowdsale.test.js | 6 +----- test/crowdsale/TimedCrowdsale.test.js | 6 +----- test/cryptography/ECDSA.test.js | 3 +-- test/cryptography/MerkleProof.test.js | 3 +-- test/drafts/Counter.test.js | 4 +--- test/drafts/ERC1046/TokenMetadata.test.js | 3 +-- test/drafts/ERC20Migrator.test.js | 6 +----- test/drafts/SignatureBouncer.test.js | 6 +----- test/drafts/TokenVesting.test.js | 6 +----- test/examples/SampleCrowdsale.test.js | 6 +----- test/examples/SimpleToken.test.js | 6 +----- test/helpers/expectEvent.js | 7 ++----- test/helpers/setup.js | 9 +++++++++ test/helpers/shouldFail.js | 3 +-- test/helpers/test/expectEvent.test.js | 5 +---- test/introspection/ERC165Checker.test.js | 3 +-- test/lifecycle/Pausable.test.js | 6 +----- test/math/Math.test.js | 6 +----- test/math/SafeMath.test.js | 5 +---- test/ownership/Ownable.behavior.js | 4 +--- test/ownership/Secondary.test.js | 3 +-- test/payment/PaymentSplitter.test.js | 6 +----- test/payment/PullPayment.test.js | 6 +----- test/payment/escrow/ConditionalEscrow.test.js | 6 +----- test/payment/escrow/Escrow.behavior.js | 6 +----- test/payment/escrow/RefundEscrow.test.js | 6 +----- test/token/ERC20/ERC20.test.js | 6 +----- test/token/ERC20/ERC20Detailed.test.js | 6 +----- test/token/ERC20/SafeERC20.test.js | 3 +-- test/token/ERC20/TokenTimelock.test.js | 6 +----- test/token/ERC20/behaviors/ERC20Burnable.behavior.js | 6 +----- test/token/ERC20/behaviors/ERC20Capped.behavior.js | 6 +----- test/token/ERC20/behaviors/ERC20Mintable.behavior.js | 6 +----- test/token/ERC721/ERC721.behavior.js | 6 +----- test/token/ERC721/ERC721.test.js | 5 +---- test/token/ERC721/ERC721Burnable.test.js | 5 +---- test/token/ERC721/ERC721Full.test.js | 5 +---- test/token/ERC721/ERC721Holder.test.js | 3 +-- test/token/ERC721/ERC721MintBurn.behavior.js | 6 +----- test/token/ERC721/ERC721Mintable.test.js | 5 +---- test/token/ERC721/ERC721Pausable.test.js | 5 +---- test/token/ERC721/ERC721PausedToken.behavior.js | 6 +----- test/utils/Address.test.js | 3 +-- test/utils/Arrays.test.js | 6 +----- test/utils/ReentrancyGuard.test.js | 6 +----- 56 files changed, 65 insertions(+), 227 deletions(-) create mode 100644 test/helpers/setup.js diff --git a/test/access/Roles.test.js b/test/access/Roles.test.js index 4a3c7b09f89..15fffec3498 100644 --- 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 index 996f843d1b4..c18b6097410 100644 --- 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 index 5f4c0ad3050..4a53c5f9781 100644 --- 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 index a073d7a4edd..8199ec32e73 100644 --- 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 index c2646db9b06..dbd33f1aa68 100644 --- 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 index 48b71d51d06..778dbcb98fa 100644 --- 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 index 34b47618678..c9ba167eabc 100644 --- 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 index c92fad46698..36de85f042a 100644 --- 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 index e58d54aa61b..ec41e494858 100644 --- 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 index 0b95f9ab8ef..98e54646d6c 100644 --- 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 index 58d8c11233b..e1e3b40a5d1 100644 --- 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 index ce16f66f570..9c8d01c721e 100644 --- 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 index 4689ad820a0..2f6e3e15cfd 100644 --- 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 index b07178b206e..1909b848d18 100644 --- 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 index 8940b240c34..86942304823 100644 --- 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 index 8a2929d9334..008e76778f9 100644 --- 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 index 9810d9119bb..58aaa3a3322 100644 --- 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 index 92763a219f2..05c8f5f033b 100644 --- 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 index e1bb294f375..4e204011a97 100644 --- 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 index be872ae2260..cb8fc18b58b 100644 --- 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 index 51df3c40e4c..e768265b499 100644 --- 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 index 091f31715cb..540ce4ae021 100644 --- 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 index 3cb6b37ecba..29d1027c355 100644 --- 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 new file mode 100644 index 00000000000..d27794d5ed6 --- /dev/null +++ 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 index a64e1a59c69..139339c7e80 100644 --- 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 index c5d09a4ed57..4dd81560fc1 100644 --- 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 index 7f5dc9fc583..c339c78ab78 100644 --- 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 index f279e09a72e..7b8d3e8cb38 100644 --- 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 index 3e801d0e9f0..99ab045319b 100644 --- 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 index 47e8559efc7..b006e06e18b 100644 --- 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 index dd6007cefef..a23030d0bd1 100644 --- 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 index c8772db1f90..cbc96320aae 100644 --- 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 index 34404536e93..58c1712db67 100644 --- 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'); diff --git a/test/payment/PullPayment.test.js b/test/payment/PullPayment.test.js index 13b27ff01d4..f82712ef3e2 100644 --- a/test/payment/PullPayment.test.js +++ b/test/payment/PullPayment.test.js @@ -1,11 +1,7 @@ const { balanceDifference } = require('../helpers/balanceDifference'); const { ether } = require('../helpers/ether'); -const BigNumber = web3.BigNumber; - -require('chai') - .use(require('chai-bignumber')(BigNumber)) - .should(); +require('../helpers/setup'); const PullPaymentMock = artifacts.require('PullPaymentMock'); diff --git a/test/payment/escrow/ConditionalEscrow.test.js b/test/payment/escrow/ConditionalEscrow.test.js index c30b7bde5e1..bb5b5cf9872 100644 --- a/test/payment/escrow/ConditionalEscrow.test.js +++ b/test/payment/escrow/ConditionalEscrow.test.js @@ -3,11 +3,7 @@ const { shouldBehaveLikeEscrow } = require('./Escrow.behavior'); const shouldFail = require('../../helpers/shouldFail'); const { ether } = require('../../helpers/ether'); -const BigNumber = web3.BigNumber; - -require('chai') - .use(require('chai-bignumber')(BigNumber)) - .should(); +require('../../helpers/setup'); const ConditionalEscrowMock = artifacts.require('ConditionalEscrowMock'); diff --git a/test/payment/escrow/Escrow.behavior.js b/test/payment/escrow/Escrow.behavior.js index 7dd0918a468..80bde2f5c5a 100644 --- a/test/payment/escrow/Escrow.behavior.js +++ b/test/payment/escrow/Escrow.behavior.js @@ -4,11 +4,7 @@ const { ethGetBalance } = require('../../helpers/web3'); const { balanceDifference } = require('../../helpers/balanceDifference'); const { ether } = require('../../helpers/ether'); -const BigNumber = web3.BigNumber; - -require('chai') - .use(require('chai-bignumber')(BigNumber)) - .should(); +require('../../helpers/setup'); function shouldBehaveLikeEscrow (primary, [payee1, payee2]) { const amount = ether(42.0); diff --git a/test/payment/escrow/RefundEscrow.test.js b/test/payment/escrow/RefundEscrow.test.js index bb5189ddc2a..c0a9f8f04a2 100644 --- a/test/payment/escrow/RefundEscrow.test.js +++ b/test/payment/escrow/RefundEscrow.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(); +require('../../helpers/setup'); const RefundEscrow = artifacts.require('RefundEscrow'); diff --git a/test/token/ERC20/ERC20.test.js b/test/token/ERC20/ERC20.test.js index 42bd872fd65..16d2cab7524 100644 --- a/test/token/ERC20/ERC20.test.js +++ b/test/token/ERC20/ERC20.test.js @@ -4,11 +4,7 @@ const { ZERO_ADDRESS } = require('../../helpers/constants'); const ERC20Mock = artifacts.require('ERC20Mock'); -const BigNumber = web3.BigNumber; - -require('chai') - .use(require('chai-bignumber')(BigNumber)) - .should(); +const { BigNumber } = require('../../helpers/setup'); contract('ERC20', function ([_, owner, recipient, anotherAccount]) { beforeEach(async function () { diff --git a/test/token/ERC20/ERC20Detailed.test.js b/test/token/ERC20/ERC20Detailed.test.js index 7965b7e9dc5..448487acdeb 100644 --- a/test/token/ERC20/ERC20Detailed.test.js +++ b/test/token/ERC20/ERC20Detailed.test.js @@ -1,8 +1,4 @@ -const BigNumber = web3.BigNumber; - -require('chai') - .use(require('chai-bignumber')(BigNumber)) - .should(); +require('../../helpers/setup'); const ERC20DetailedMock = artifacts.require('ERC20DetailedMock'); diff --git a/test/token/ERC20/SafeERC20.test.js b/test/token/ERC20/SafeERC20.test.js index c8dea73822b..4be44cf384d 100644 --- a/test/token/ERC20/SafeERC20.test.js +++ b/test/token/ERC20/SafeERC20.test.js @@ -1,7 +1,6 @@ const shouldFail = require('../../helpers/shouldFail'); -require('chai') - .should(); +require('../../helpers/setup'); const SafeERC20Helper = artifacts.require('SafeERC20Helper'); diff --git a/test/token/ERC20/TokenTimelock.test.js b/test/token/ERC20/TokenTimelock.test.js index 1816bf902a7..6669e7487df 100644 --- a/test/token/ERC20/TokenTimelock.test.js +++ b/test/token/ERC20/TokenTimelock.test.js @@ -1,11 +1,7 @@ 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 ERC20Mintable = artifacts.require('ERC20Mintable'); const TokenTimelock = artifacts.require('TokenTimelock'); diff --git a/test/token/ERC20/behaviors/ERC20Burnable.behavior.js b/test/token/ERC20/behaviors/ERC20Burnable.behavior.js index 6e550afcbf8..6d1c7195b07 100644 --- a/test/token/ERC20/behaviors/ERC20Burnable.behavior.js +++ b/test/token/ERC20/behaviors/ERC20Burnable.behavior.js @@ -2,11 +2,7 @@ const shouldFail = require('../../../helpers/shouldFail'); const expectEvent = require('../../../helpers/expectEvent'); const { ZERO_ADDRESS } = require('../../../helpers/constants'); -const BigNumber = web3.BigNumber; - -require('chai') - .use(require('chai-bignumber')(BigNumber)) - .should(); +require('../../../helpers/setup'); function shouldBehaveLikeERC20Burnable (owner, initialBalance, [burner]) { describe('burn', function () { diff --git a/test/token/ERC20/behaviors/ERC20Capped.behavior.js b/test/token/ERC20/behaviors/ERC20Capped.behavior.js index e61db5702ba..876dbd329b7 100644 --- a/test/token/ERC20/behaviors/ERC20Capped.behavior.js +++ b/test/token/ERC20/behaviors/ERC20Capped.behavior.js @@ -1,10 +1,6 @@ const shouldFail = require('../../../helpers/shouldFail'); -const BigNumber = web3.BigNumber; - -require('chai') - .use(require('chai-bignumber')(BigNumber)) - .should(); +require('../../../helpers/setup'); function shouldBehaveLikeERC20Capped (minter, [anyone], cap) { describe('capped token', function () { diff --git a/test/token/ERC20/behaviors/ERC20Mintable.behavior.js b/test/token/ERC20/behaviors/ERC20Mintable.behavior.js index bb8c0fe3073..987b677524e 100644 --- a/test/token/ERC20/behaviors/ERC20Mintable.behavior.js +++ b/test/token/ERC20/behaviors/ERC20Mintable.behavior.js @@ -2,11 +2,7 @@ const shouldFail = require('../../../helpers/shouldFail'); const expectEvent = require('../../../helpers/expectEvent'); const { ZERO_ADDRESS } = require('../../../helpers/constants'); -const BigNumber = web3.BigNumber; - -require('chai') - .use(require('chai-bignumber')(BigNumber)) - .should(); +require('../../../helpers/setup'); function shouldBehaveLikeERC20Mintable (minter, [anyone]) { describe('as a mintable token', function () { diff --git a/test/token/ERC721/ERC721.behavior.js b/test/token/ERC721/ERC721.behavior.js index d350c3f6ca8..b7600872c09 100644 --- a/test/token/ERC721/ERC721.behavior.js +++ b/test/token/ERC721/ERC721.behavior.js @@ -5,11 +5,7 @@ const { ZERO_ADDRESS } = require('../../helpers/constants'); const send = require('../../helpers/send'); const ERC721ReceiverMock = artifacts.require('ERC721ReceiverMock.sol'); -const BigNumber = web3.BigNumber; - -require('chai') - .use(require('chai-bignumber')(BigNumber)) - .should(); +require('../../helpers/setup'); function shouldBehaveLikeERC721 ( creator, diff --git a/test/token/ERC721/ERC721.test.js b/test/token/ERC721/ERC721.test.js index eef76eba8b9..87e895f143b 100644 --- a/test/token/ERC721/ERC721.test.js +++ b/test/token/ERC721/ERC721.test.js @@ -1,11 +1,8 @@ const { shouldBehaveLikeERC721 } = require('./ERC721.behavior'); -const BigNumber = web3.BigNumber; const ERC721Mock = artifacts.require('ERC721Mock.sol'); -require('chai') - .use(require('chai-bignumber')(BigNumber)) - .should(); +require('../../helpers/setup'); contract('ERC721', function ([_, creator, ...accounts]) { beforeEach(async function () { diff --git a/test/token/ERC721/ERC721Burnable.test.js b/test/token/ERC721/ERC721Burnable.test.js index 745f7dac2bf..a75e60ff88a 100644 --- a/test/token/ERC721/ERC721Burnable.test.js +++ b/test/token/ERC721/ERC721Burnable.test.js @@ -3,12 +3,9 @@ const { shouldBehaveLikeMintAndBurnERC721, } = require('./ERC721MintBurn.behavior'); -const BigNumber = web3.BigNumber; const ERC721BurnableImpl = artifacts.require('ERC721MintableBurnableImpl.sol'); -require('chai') - .use(require('chai-bignumber')(BigNumber)) - .should(); +require('../../helpers/setup'); contract('ERC721Burnable', function ([_, creator, ...accounts]) { const minter = creator; diff --git a/test/token/ERC721/ERC721Full.test.js b/test/token/ERC721/ERC721Full.test.js index 933f624eeb0..3870a95f671 100644 --- a/test/token/ERC721/ERC721Full.test.js +++ b/test/token/ERC721/ERC721Full.test.js @@ -2,12 +2,9 @@ const shouldFail = require('../../helpers/shouldFail'); const { shouldBehaveLikeERC721 } = require('./ERC721.behavior'); const { shouldSupportInterfaces } = require('../../introspection/SupportsInterface.behavior'); -const BigNumber = web3.BigNumber; const ERC721FullMock = artifacts.require('ERC721FullMock.sol'); -require('chai') - .use(require('chai-bignumber')(BigNumber)) - .should(); +require('../../helpers/setup'); contract('ERC721Full', function ([ creator, diff --git a/test/token/ERC721/ERC721Holder.test.js b/test/token/ERC721/ERC721Holder.test.js index 9f6eb856a13..1c0b0dcdfbd 100644 --- a/test/token/ERC721/ERC721Holder.test.js +++ b/test/token/ERC721/ERC721Holder.test.js @@ -1,8 +1,7 @@ const ERC721Holder = artifacts.require('ERC721Holder.sol'); const ERC721Mintable = artifacts.require('ERC721MintableBurnableImpl.sol'); -require('chai') - .should(); +require('../../helpers/setup'); contract('ERC721Holder', function ([creator]) { it('receives an ERC721 token', async function () { diff --git a/test/token/ERC721/ERC721MintBurn.behavior.js b/test/token/ERC721/ERC721MintBurn.behavior.js index 1bb7d1bc7d7..97c33ae3630 100644 --- a/test/token/ERC721/ERC721MintBurn.behavior.js +++ b/test/token/ERC721/ERC721MintBurn.behavior.js @@ -1,11 +1,7 @@ const shouldFail = require('../../helpers/shouldFail'); const expectEvent = require('../../helpers/expectEvent'); const { ZERO_ADDRESS } = require('../../helpers/constants'); -const BigNumber = web3.BigNumber; - -require('chai') - .use(require('chai-bignumber')(BigNumber)) - .should(); +require('../../helpers/setup'); function shouldBehaveLikeMintAndBurnERC721 ( creator, diff --git a/test/token/ERC721/ERC721Mintable.test.js b/test/token/ERC721/ERC721Mintable.test.js index 639c8374d6c..97a129efbf2 100644 --- a/test/token/ERC721/ERC721Mintable.test.js +++ b/test/token/ERC721/ERC721Mintable.test.js @@ -3,12 +3,9 @@ const { shouldBehaveLikeMintAndBurnERC721, } = require('./ERC721MintBurn.behavior'); -const BigNumber = web3.BigNumber; const ERC721MintableImpl = artifacts.require('ERC721MintableBurnableImpl.sol'); -require('chai') - .use(require('chai-bignumber')(BigNumber)) - .should(); +require('../../helpers/setup'); contract('ERC721Mintable', function ([_, creator, ...accounts]) { const minter = creator; diff --git a/test/token/ERC721/ERC721Pausable.test.js b/test/token/ERC721/ERC721Pausable.test.js index 3961368ef74..ca728001d49 100644 --- a/test/token/ERC721/ERC721Pausable.test.js +++ b/test/token/ERC721/ERC721Pausable.test.js @@ -2,12 +2,9 @@ const { shouldBehaveLikeERC721PausedToken } = require('./ERC721PausedToken.behav const { shouldBehaveLikeERC721 } = require('./ERC721.behavior'); const { shouldBehaveLikePublicRole } = require('../../access/roles/PublicRole.behavior'); -const BigNumber = web3.BigNumber; const ERC721PausableMock = artifacts.require('ERC721PausableMock.sol'); -require('chai') - .use(require('chai-bignumber')(BigNumber)) - .should(); +require('../../helpers/setup'); contract('ERC721Pausable', function ([ _, diff --git a/test/token/ERC721/ERC721PausedToken.behavior.js b/test/token/ERC721/ERC721PausedToken.behavior.js index d44bc0565f5..6df4b0cc405 100644 --- a/test/token/ERC721/ERC721PausedToken.behavior.js +++ b/test/token/ERC721/ERC721PausedToken.behavior.js @@ -2,11 +2,7 @@ const shouldFail = require('../../helpers/shouldFail'); const send = require('../../helpers/send'); const { ZERO_ADDRESS } = require('../../helpers/constants'); -const BigNumber = web3.BigNumber; - -require('chai') - .use(require('chai-bignumber')(BigNumber)) - .should(); +require('../../helpers/setup'); function shouldBehaveLikeERC721PausedToken (owner, [recipient, operator]) { const firstTokenId = 1; diff --git a/test/utils/Address.test.js b/test/utils/Address.test.js index f41e5756519..23c2b1dfbc2 100644 --- a/test/utils/Address.test.js +++ b/test/utils/Address.test.js @@ -1,8 +1,7 @@ const AddressImpl = artifacts.require('AddressImpl'); const SimpleToken = artifacts.require('SimpleToken'); -require('chai') - .should(); +require('../helpers/setup'); contract('Address', function ([_, anyone]) { beforeEach(async function () { diff --git a/test/utils/Arrays.test.js b/test/utils/Arrays.test.js index 4bfc9eabacc..1c9bfdfc072 100644 --- a/test/utils/Arrays.test.js +++ b/test/utils/Arrays.test.js @@ -1,10 +1,6 @@ const ArraysImpl = artifacts.require('ArraysImpl'); -const BigNumber = web3.BigNumber; - -require('chai') - .use(require('chai-bignumber')(BigNumber)) - .should(); +require('../helpers/setup'); contract('Arrays', function () { context('Even number of elements', function () { diff --git a/test/utils/ReentrancyGuard.test.js b/test/utils/ReentrancyGuard.test.js index 16706fe8eb5..c6da57a9519 100644 --- a/test/utils/ReentrancyGuard.test.js +++ b/test/utils/ReentrancyGuard.test.js @@ -2,11 +2,7 @@ const shouldFail = require('../helpers/shouldFail'); const ReentrancyMock = artifacts.require('ReentrancyMock'); const ReentrancyAttack = artifacts.require('ReentrancyAttack'); -const BigNumber = web3.BigNumber; - -require('chai') - .use(require('chai-bignumber')(BigNumber)) - .should(); +require('../helpers/setup'); contract('ReentrancyGuard', function () { beforeEach(async function () {