From b52912c7020cf0de42f3d6c79bf6a556a2727d4c Mon Sep 17 00:00:00 2001 From: Francisco Giordano Date: Mon, 13 Aug 2018 06:39:00 -0300 Subject: [PATCH] change dos file format to unix (#1198) used dos2unix program --- test/token/ERC20/CappedToken.behavior.js | 72 +++++++++---------- test/token/ERC20/RBACCappedToken.test.js | 38 +++++----- .../token/ERC20/RBACMintableToken.behavior.js | 64 ++++++++--------- 3 files changed, 87 insertions(+), 87 deletions(-) diff --git a/test/token/ERC20/CappedToken.behavior.js b/test/token/ERC20/CappedToken.behavior.js index 249d15559..85e3380d1 100644 --- a/test/token/ERC20/CappedToken.behavior.js +++ b/test/token/ERC20/CappedToken.behavior.js @@ -1,36 +1,36 @@ -const { expectThrow } = require('../../helpers/expectThrow'); - -const BigNumber = web3.BigNumber; - -require('chai') - .use(require('chai-bignumber')(BigNumber)) - .should(); - -function shouldBehaveLikeCappedToken (minter, [anyone], cap) { - describe('capped token', function () { - const from = minter; - - it('should start with the correct cap', async function () { - (await this.token.cap()).should.be.bignumber.equal(cap); - }); - - it('should mint when amount is less than cap', async function () { - const result = await this.token.mint(anyone, cap.sub(1), { from }); - result.logs[0].event.should.equal('Mint'); - }); - - it('should fail to mint if the ammount exceeds the cap', async function () { - await this.token.mint(anyone, cap.sub(1), { from }); - await expectThrow(this.token.mint(anyone, 100, { from })); - }); - - it('should fail to mint after cap is reached', async function () { - await this.token.mint(anyone, cap, { from }); - await expectThrow(this.token.mint(anyone, 1, { from })); - }); - }); -} - -module.exports = { - shouldBehaveLikeCappedToken, -}; +const { expectThrow } = require('../../helpers/expectThrow'); + +const BigNumber = web3.BigNumber; + +require('chai') + .use(require('chai-bignumber')(BigNumber)) + .should(); + +function shouldBehaveLikeCappedToken (minter, [anyone], cap) { + describe('capped token', function () { + const from = minter; + + it('should start with the correct cap', async function () { + (await this.token.cap()).should.be.bignumber.equal(cap); + }); + + it('should mint when amount is less than cap', async function () { + const result = await this.token.mint(anyone, cap.sub(1), { from }); + result.logs[0].event.should.equal('Mint'); + }); + + it('should fail to mint if the ammount exceeds the cap', async function () { + await this.token.mint(anyone, cap.sub(1), { from }); + await expectThrow(this.token.mint(anyone, 100, { from })); + }); + + it('should fail to mint after cap is reached', async function () { + await this.token.mint(anyone, cap, { from }); + await expectThrow(this.token.mint(anyone, 1, { from })); + }); + }); +} + +module.exports = { + shouldBehaveLikeCappedToken, +}; diff --git a/test/token/ERC20/RBACCappedToken.test.js b/test/token/ERC20/RBACCappedToken.test.js index 3cd6ed917..3f3ca71a7 100644 --- a/test/token/ERC20/RBACCappedToken.test.js +++ b/test/token/ERC20/RBACCappedToken.test.js @@ -1,19 +1,19 @@ -const { ether } = require('../../helpers/ether'); -const { shouldBehaveLikeRBACMintableToken } = require('./RBACMintableToken.behavior'); -const { shouldBehaveLikeMintableToken } = require('./MintableToken.behavior'); -const { shouldBehaveLikeCappedToken } = require('./CappedToken.behavior'); - -const RBACCappedTokenMock = artifacts.require('RBACCappedTokenMock'); - -contract('RBACCappedToken', function ([_, owner, minter, ...otherAccounts]) { - const cap = ether(1000); - - beforeEach(async function () { - this.token = await RBACCappedTokenMock.new(cap, { from: owner }); - await this.token.addMinter(minter, { from: owner }); - }); - - shouldBehaveLikeMintableToken(owner, minter, otherAccounts); - shouldBehaveLikeRBACMintableToken(owner, otherAccounts); - shouldBehaveLikeCappedToken(minter, otherAccounts, cap); -}); +const { ether } = require('../../helpers/ether'); +const { shouldBehaveLikeRBACMintableToken } = require('./RBACMintableToken.behavior'); +const { shouldBehaveLikeMintableToken } = require('./MintableToken.behavior'); +const { shouldBehaveLikeCappedToken } = require('./CappedToken.behavior'); + +const RBACCappedTokenMock = artifacts.require('RBACCappedTokenMock'); + +contract('RBACCappedToken', function ([_, owner, minter, ...otherAccounts]) { + const cap = ether(1000); + + beforeEach(async function () { + this.token = await RBACCappedTokenMock.new(cap, { from: owner }); + await this.token.addMinter(minter, { from: owner }); + }); + + shouldBehaveLikeMintableToken(owner, minter, otherAccounts); + shouldBehaveLikeRBACMintableToken(owner, otherAccounts); + shouldBehaveLikeCappedToken(minter, otherAccounts, cap); +}); diff --git a/test/token/ERC20/RBACMintableToken.behavior.js b/test/token/ERC20/RBACMintableToken.behavior.js index b46eca40a..b58586dd8 100644 --- a/test/token/ERC20/RBACMintableToken.behavior.js +++ b/test/token/ERC20/RBACMintableToken.behavior.js @@ -1,32 +1,32 @@ -const { expectThrow } = require('../../helpers/expectThrow'); - -const ROLE_MINTER = 'minter'; - -function shouldBehaveLikeRBACMintableToken (owner, [anyone]) { - describe('handle roles', function () { - it('owner can add and remove a minter role', async function () { - await this.token.addMinter(anyone, { from: owner }); - let hasRole = await this.token.hasRole(anyone, ROLE_MINTER); - hasRole.should.be.true; - - await this.token.removeMinter(anyone, { from: owner }); - hasRole = await this.token.hasRole(anyone, ROLE_MINTER); - hasRole.should.be.false; - }); - - it('anyone can\'t add or remove a minter role', async function () { - await expectThrow( - this.token.addMinter(anyone, { from: anyone }) - ); - - await this.token.addMinter(anyone, { from: owner }); - await expectThrow( - this.token.removeMinter(anyone, { from: anyone }) - ); - }); - }); -} - -module.exports = { - shouldBehaveLikeRBACMintableToken, -}; +const { expectThrow } = require('../../helpers/expectThrow'); + +const ROLE_MINTER = 'minter'; + +function shouldBehaveLikeRBACMintableToken (owner, [anyone]) { + describe('handle roles', function () { + it('owner can add and remove a minter role', async function () { + await this.token.addMinter(anyone, { from: owner }); + let hasRole = await this.token.hasRole(anyone, ROLE_MINTER); + hasRole.should.be.true; + + await this.token.removeMinter(anyone, { from: owner }); + hasRole = await this.token.hasRole(anyone, ROLE_MINTER); + hasRole.should.be.false; + }); + + it('anyone can\'t add or remove a minter role', async function () { + await expectThrow( + this.token.addMinter(anyone, { from: anyone }) + ); + + await this.token.addMinter(anyone, { from: owner }); + await expectThrow( + this.token.removeMinter(anyone, { from: anyone }) + ); + }); + }); +} + +module.exports = { + shouldBehaveLikeRBACMintableToken, +};