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

Remove lodash from tests (#1323)

Browse Source 
(cherry picked from commit d062352de7)
This commit is contained in:
Roman Exempliarov
2018-09-17 23:21:01 +03:00
committed by Leo Arias
parent f8b0cec15b
commit a3bb56769e
3 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
test/helpers/sendTransaction.js
View File

@ -1,9 +1,8 @@
const _ = require('lodash');
const ethjsABI = require('ethjs-abi'); const ethjsABI = require('ethjs-abi');
function findMethod (abi, name, args) { function findMethod (abi, name, args) {
for (let i = 0; i < abi.length; i++) { for (let i = 0; i < abi.length; i++) {
const methodArgs = _.map(abi[i].inputs, 'type').join(','); const methodArgs = abi[i].inputs.map(input => input.type).join(',');
if ((abi[i].name === name) && (methodArgs === args)) { if ((abi[i].name === name) && (methodArgs === args)) {
return abi[i]; return abi[i];
} }

5
test/token/ERC721/ERC721.behavior.js
View File

@ -3,7 +3,6 @@ const { assertRevert } = require('../../helpers/assertRevert');
const { ZERO_ADDRESS } = require('../../helpers/constants'); const { ZERO_ADDRESS } = require('../../helpers/constants');
const { decodeLogs } = require('../../helpers/decodeLogs'); const { decodeLogs } = require('../../helpers/decodeLogs');
const { sendTransaction } = require('../../helpers/sendTransaction'); const { sendTransaction } = require('../../helpers/sendTransaction');
const _ = require('lodash');
const ERC721Receiver = artifacts.require('ERC721ReceiverMock.sol'); const ERC721Receiver = artifacts.require('ERC721ReceiverMock.sol');
const BigNumber = web3.BigNumber; const BigNumber = web3.BigNumber;
@ -175,7 +174,9 @@ function shouldBehaveLikeERC721 (
it('keeps same tokens by index', async function () { it('keeps same tokens by index', async function () {
if (!this.token.tokenOfOwnerByIndex) return; if (!this.token.tokenOfOwnerByIndex) return;
const tokensListed = await Promise.all(_.range(2).map(i => this.token.tokenOfOwnerByIndex(owner, i))); const tokensListed = await Promise.all(
[0, 1].map(i => this.token.tokenOfOwnerByIndex(owner, i))
);
tokensListed.map(t => t.toNumber()).should.have.members([firstTokenId, secondTokenId]); tokensListed.map(t => t.toNumber()).should.have.members([firstTokenId, secondTokenId]);
}); });
}); });

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

@ -1,7 +1,6 @@
const { assertRevert } = require('../../helpers/assertRevert'); const { assertRevert } = require('../../helpers/assertRevert');
const { shouldBehaveLikeERC721 } = require('./ERC721.behavior'); const { shouldBehaveLikeERC721 } = require('./ERC721.behavior');
const { shouldSupportInterfaces } = require('../../introspection/SupportsInterface.behavior'); const { shouldSupportInterfaces } = require('../../introspection/SupportsInterface.behavior');
const _ = require('lodash');
const BigNumber = web3.BigNumber; const BigNumber = web3.BigNumber;
const ERC721FullMock = artifacts.require('ERC721FullMock.sol'); const ERC721FullMock = artifacts.require('ERC721FullMock.sol');
@ -172,7 +171,9 @@ contract('ERC721Full', function ([
it('returns correct token IDs for target', async function () { it('returns correct token IDs for target', async function () {
(await this.token.balanceOf(another)).toNumber().should.be.equal(2); (await this.token.balanceOf(another)).toNumber().should.be.equal(2);
const tokensListed = await Promise.all(_.range(2).map(i => this.token.tokenOfOwnerByIndex(another, i))); const tokensListed = await Promise.all(
[0, 1].map(i => this.token.tokenOfOwnerByIndex(another, i))
);
tokensListed.map(t => t.toNumber()).should.have.members([firstTokenId, secondTokenId]); tokensListed.map(t => t.toNumber()).should.have.members([firstTokenId, secondTokenId]);
}); });
@ -185,7 +186,9 @@ contract('ERC721Full', function ([
describe('tokenByIndex', function () { describe('tokenByIndex', function () {
it('should return all tokens', async function () { it('should return all tokens', async function () {
const tokensListed = await Promise.all(_.range(2).map(i => this.token.tokenByIndex(i))); const tokensListed = await Promise.all(
[0, 1].map(i => this.token.tokenByIndex(i))
);
tokensListed.map(t => t.toNumber()).should.have.members([firstTokenId, secondTokenId]); tokensListed.map(t => t.toNumber()).should.have.members([firstTokenId, secondTokenId]);
}); });
@ -204,9 +207,10 @@ contract('ERC721Full', function ([
(await this.token.totalSupply()).toNumber().should.be.equal(3); (await this.token.totalSupply()).toNumber().should.be.equal(3);
const tokensListed = await Promise.all(_.range(3).map(i => this.token.tokenByIndex(i))); const tokensListed = await Promise.all(
const expectedTokens = _.filter( [0, 1, 2].map(i => this.token.tokenByIndex(i))
[firstTokenId, secondTokenId, newTokenId, anotherNewTokenId], );
const expectedTokens = [firstTokenId, secondTokenId, newTokenId, anotherNewTokenId].filter(
x => (x !== tokenId) x => (x !== tokenId)
); );
tokensListed.map(t => t.toNumber()).should.have.members(expectedTokens); tokensListed.map(t => t.toNumber()).should.have.members(expectedTokens);