Merge branch 'release-v2.0.0' of github.com:OpenZeppelin/openzeppelin-solidity into release-v2.0.0

This commit is contained in:
Francisco Giordano
2018-09-26 18:19:41 -03:00
15 changed files with 174 additions and 326 deletions

View File

@ -11,136 +11,44 @@ function shouldBehaveLikeERC20Mintable (minter, [anyone]) {
const ZERO_ADDRESS = '0x0000000000000000000000000000000000000000';
describe('as a mintable token', function () {
describe('mintingFinished', function () {
context('when token minting is not finished', function () {
it('returns false', async function () {
(await this.token.mintingFinished()).should.equal(false);
});
});
context('when token minting is finished', function () {
beforeEach(async function () {
await this.token.finishMinting({ from: minter });
});
it('returns true', async function () {
(await this.token.mintingFinished()).should.equal(true);
});
});
});
describe('finishMinting', function () {
context('when the sender has minting permission', function () {
const from = minter;
context('when token minting was not finished', function () {
it('finishes token minting', async function () {
await this.token.finishMinting({ from });
(await this.token.mintingFinished()).should.equal(true);
});
it('emits a mint finished event', async function () {
const { logs } = await this.token.finishMinting({ from });
await expectEvent.inLogs(logs, 'MintingFinished');
});
});
context('when token minting was already finished', function () {
beforeEach(async function () {
await this.token.finishMinting({ from });
});
it('reverts', async function () {
await assertRevert(this.token.finishMinting({ from }));
});
});
});
context('when the sender doesn\'t have minting permission', function () {
const from = anyone;
context('when token minting was not finished', function () {
it('reverts', async function () {
await assertRevert(this.token.finishMinting({ from }));
});
});
context('when token minting was already finished', function () {
beforeEach(async function () {
await this.token.finishMinting({ from: minter });
});
it('reverts', async function () {
await assertRevert(this.token.finishMinting({ from }));
});
});
});
});
describe('mint', function () {
const amount = 100;
context('when the sender has minting permission', function () {
const from = minter;
context('when token minting is not finished', function () {
context('for a zero amount', function () {
shouldMint(0);
});
context('for a non-zero amount', function () {
shouldMint(amount);
});
function shouldMint (amount) {
beforeEach(async function () {
({ logs: this.logs } = await this.token.mint(anyone, amount, { from }));
});
it('mints the requested amount', async function () {
(await this.token.balanceOf(anyone)).should.be.bignumber.equal(amount);
});
it('emits a mint and a transfer event', async function () {
const transferEvent = expectEvent.inLogs(this.logs, 'Transfer', {
from: ZERO_ADDRESS,
to: anyone,
});
transferEvent.args.value.should.be.bignumber.equal(amount);
});
}
context('for a zero amount', function () {
shouldMint(0);
});
context('when token minting is finished', function () {
context('for a non-zero amount', function () {
shouldMint(amount);
});
function shouldMint (amount) {
beforeEach(async function () {
await this.token.finishMinting({ from: minter });
({ logs: this.logs } = await this.token.mint(anyone, amount, { from }));
});
it('reverts', async function () {
await assertRevert(this.token.mint(anyone, amount, { from }));
it('mints the requested amount', async function () {
(await this.token.balanceOf(anyone)).should.be.bignumber.equal(amount);
});
});
it('emits a mint and a transfer event', async function () {
const transferEvent = expectEvent.inLogs(this.logs, 'Transfer', {
from: ZERO_ADDRESS,
to: anyone,
});
transferEvent.args.value.should.be.bignumber.equal(amount);
});
}
});
context('when the sender doesn\'t have minting permission', function () {
const from = anyone;
context('when token minting is not finished', function () {
it('reverts', async function () {
await assertRevert(this.token.mint(anyone, amount, { from }));
});
});
context('when token minting is already finished', function () {
beforeEach(async function () {
await this.token.finishMinting({ from: minter });
});
it('reverts', async function () {
await assertRevert(this.token.mint(anyone, amount, { from }));
});
it('reverts', async function () {
await assertRevert(this.token.mint(anyone, amount, { from }));
});
});
});

View File

@ -0,0 +1,19 @@
const ERC721Holder = artifacts.require('ERC721Holder.sol');
const ERC721Mintable = artifacts.require('ERC721MintableBurnableImpl.sol');
require('chai')
.should();
contract('ERC721Holder', function ([creator]) {
it('receives an ERC721 token', async function () {
const token = await ERC721Mintable.new({ from: creator });
const tokenId = 1;
await token.mint(creator, tokenId, { from: creator });
const receiver = await ERC721Holder.new();
await token.approve(receiver.address, tokenId, { from: creator });
await token.safeTransferFrom(creator, receiver.address, tokenId);
(await token.ownerOf(tokenId)).should.be.equal(receiver.address);
});
});

View File

@ -117,35 +117,6 @@ function shouldBehaveLikeMintAndBurnERC721 (
});
});
});
describe('finishMinting', function () {
it('allows the minter to finish minting', async function () {
const { logs } = await this.token.finishMinting({ from: minter });
expectEvent.inLogs(logs, 'MintingFinished');
});
});
context('mintingFinished', function () {
beforeEach(async function () {
await this.token.finishMinting({ from: minter });
});
describe('mint', function () {
it('reverts', async function () {
await assertRevert(
this.token.mint(owner, thirdTokenId, { from: minter })
);
});
});
describe('mintWithTokenURI', function () {
it('reverts', async function () {
await assertRevert(
this.token.mintWithTokenURI(owner, thirdTokenId, MOCK_URI, { from: minter })
);
});
});
});
});
}