NoBey/openzeppelin-contracts
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'solidity/release-v2.0.0' into oz-sol-rc3

Browse Source
This commit is contained in:
Nicolás Venturo
2018-10-04 12:00:12 -03:00
parent 3df0a786e4 2d30918149
commit f29e98f772
19 changed files with 187 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/token/ERC721/ERC721Full.test.js
View File

@ -1,6 +1,5 @@
const { assertRevert } = require('../../helpers/assertRevert');
const { shouldBehaveLikeERC721 } = require('./ERC721.behavior');
const { shouldBehaveLikeMintAndBurnERC721 } = require('./ERC721MintBurn.behavior');
const { shouldSupportInterfaces } = require('../../introspection/SupportsInterface.behavior');
const _ = require('lodash');
@ -217,7 +216,6 @@ contract('ERC721Full', function ([
});
shouldBehaveLikeERC721(creator, minter, accounts);
shouldBehaveLikeMintAndBurnERC721(creator, minter, accounts);
shouldSupportInterfaces([
'ERC165',

4
test/token/ERC721/ERC721MintBurn.behavior.js
View File

@ -52,13 +52,13 @@ function shouldBehaveLikeMintAndBurnERC721 (
describe('when the given owner address is the zero address', function () {
it('reverts', async function () {
await assertRevert(this.token.mint(ZERO_ADDRESS, thirdTokenId));
await assertRevert(this.token.mint(ZERO_ADDRESS, thirdTokenId, { from: minter }));
});
});
describe('when the given token ID was already tracked by this contract', function () {
it('reverts', async function () {
await assertRevert(this.token.mint(owner, firstTokenId));
await assertRevert(this.token.mint(owner, firstTokenId, { from: minter }));
});
});
});