Skip to content

Changed .eq to .equal. #1231

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shrugs merged 2 commits into from
Aug 23, 2018
Merged

Changed .eq to .equal. #1231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
17a8239
Changed .eq to .equal.
nventuro Aug 23, 2018
13204db
Merge branch 'master' into eq-equal
nventuro Aug 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions test/token/ERC20/BurnableToken.behavior.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@ function shouldBehaveLikeBurnableToken (owner, initialBalance, [burner]) {

it('emits a burn event', async function () {
const event = expectEvent.inLogs(this.logs, 'Burn');
event.args.burner.should.eq(owner);
event.args.burner.should.equal(owner);
event.args.value.should.be.bignumber.equal(amount);
});

it('emits a transfer event', async function () {
const event = expectEvent.inLogs(this.logs, 'Transfer');
event.args.from.should.eq(owner);
event.args.to.should.eq(ZERO_ADDRESS);
event.args.from.should.equal(owner);
event.args.to.should.equal(ZERO_ADDRESS);
event.args.value.should.be.bignumber.equal(amount);
});
}
Expand Down Expand Up @@ -81,14 +81,14 @@ function shouldBehaveLikeBurnableToken (owner, initialBalance, [burner]) {

it('emits a burn event', async function () {
const event = expectEvent.inLogs(this.logs, 'Burn');
event.args.burner.should.eq(owner);
event.args.burner.should.equal(owner);
event.args.value.should.be.bignumber.equal(amount);
});

it('emits a transfer event', async function () {
const event = expectEvent.inLogs(this.logs, 'Transfer');
event.args.from.should.eq(owner);
event.args.to.should.eq(ZERO_ADDRESS);
event.args.from.should.equal(owner);
event.args.to.should.equal(ZERO_ADDRESS);
event.args.value.should.be.bignumber.equal(amount);
});
}
Expand Down
2 changes: 1 addition & 1 deletion test/token/ERC20/MintableToken.behavior.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ function shouldBehaveLikeMintableToken (owner, minter, [anyone]) {
const { logs } = await this.token.finishMinting({ from });

logs.length.should.be.equal(1);
logs[0].event.should.eq('MintFinished');
logs[0].event.should.equal('MintFinished');
});
});

Expand Down
8 changes: 4 additions & 4 deletions test/token/ERC20/PausableToken.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ contract('PausableToken', function ([_, owner, recipient, anotherAccount]) {
it('emits a Pause event', async function () {
const { logs } = await this.token.pause({ from });

logs.length.should.eq(1);
logs[0].event.should.eq('Pause');
logs.length.should.equal(1);
logs[0].event.should.equal('Pause');
});
});

Expand Down Expand Up @@ -61,8 +61,8 @@ contract('PausableToken', function ([_, owner, recipient, anotherAccount]) {
it('emits an Unpause event', async function () {
const { logs } = await this.token.unpause({ from });

logs.length.should.eq(1);
logs[0].event.should.eq('Unpause');
logs.length.should.equal(1);
logs[0].event.should.equal('Unpause');
});
});

Expand Down
80 changes: 40 additions & 40 deletions test/token/ERC20/StandardToken.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,10 @@ contract('StandardToken', function ([_, owner, recipient, anotherAccount]) {
it('emits an approval event', async function () {
const { logs } = await this.token.approve(spender, amount, { from: owner });

logs.length.should.eq(1);
logs[0].event.should.eq('Approval');
logs[0].args.owner.should.eq(owner);
logs[0].args.spender.should.eq(spender);
logs.length.should.equal(1);
logs[0].event.should.equal('Approval');
logs[0].args.owner.should.equal(owner);
logs[0].args.spender.should.equal(spender);
logs[0].args.value.should.be.bignumber.equal(amount);
});

Expand Down Expand Up @@ -125,10 +125,10 @@ contract('StandardToken', function ([_, owner, recipient, anotherAccount]) {
it('emits an approval event', async function () {
const { logs } = await this.token.approve(spender, amount, { from: owner });

logs.length.should.eq(1);
logs[0].event.should.eq('Approval');
logs[0].args.owner.should.eq(owner);
logs[0].args.spender.should.eq(spender);
logs.length.should.equal(1);
logs[0].event.should.equal('Approval');
logs[0].args.owner.should.equal(owner);
logs[0].args.spender.should.equal(spender);
logs[0].args.value.should.be.bignumber.equal(amount);
});

Expand Down Expand Up @@ -167,10 +167,10 @@ contract('StandardToken', function ([_, owner, recipient, anotherAccount]) {
it('emits an approval event', async function () {
const { logs } = await this.token.approve(spender, amount, { from: owner });

logs.length.should.eq(1);
logs[0].event.should.eq('Approval');
logs[0].args.owner.should.eq(owner);
logs[0].args.spender.should.eq(spender);
logs.length.should.equal(1);
logs[0].event.should.equal('Approval');
logs[0].args.owner.should.equal(owner);
logs[0].args.spender.should.equal(spender);
logs[0].args.value.should.be.bignumber.equal(amount);
});
});
Expand Down Expand Up @@ -207,10 +207,10 @@ contract('StandardToken', function ([_, owner, recipient, anotherAccount]) {
it('emits a transfer event', async function () {
const { logs } = await this.token.transferFrom(owner, to, amount, { from: spender });

logs.length.should.eq(1);
logs[0].event.should.eq('Transfer');
logs[0].args.from.should.eq(owner);
logs[0].args.to.should.eq(to);
logs.length.should.equal(1);
logs[0].event.should.equal('Transfer');
logs[0].args.from.should.equal(owner);
logs[0].args.to.should.equal(to);
logs[0].args.value.should.be.bignumber.equal(amount);
});
});
Expand Down Expand Up @@ -271,10 +271,10 @@ contract('StandardToken', function ([_, owner, recipient, anotherAccount]) {
it('emits an approval event', async function () {
const { logs } = await this.token.decreaseApproval(spender, amount, { from: owner });

logs.length.should.eq(1);
logs[0].event.should.eq('Approval');
logs[0].args.owner.should.eq(owner);
logs[0].args.spender.should.eq(spender);
logs.length.should.equal(1);
logs[0].event.should.equal('Approval');
logs[0].args.owner.should.equal(owner);
logs[0].args.spender.should.equal(spender);
logs[0].args.value.should.be.bignumber.equal(0);
});

Expand Down Expand Up @@ -317,10 +317,10 @@ contract('StandardToken', function ([_, owner, recipient, anotherAccount]) {
it('emits an approval event', async function () {
const { logs } = await this.token.decreaseApproval(spender, amount, { from: owner });

logs.length.should.eq(1);
logs[0].event.should.eq('Approval');
logs[0].args.owner.should.eq(owner);
logs[0].args.spender.should.eq(spender);
logs.length.should.equal(1);
logs[0].event.should.equal('Approval');
logs[0].args.owner.should.equal(owner);
logs[0].args.spender.should.equal(spender);
logs[0].args.value.should.be.bignumber.equal(0);
});

Expand Down Expand Up @@ -359,10 +359,10 @@ contract('StandardToken', function ([_, owner, recipient, anotherAccount]) {
it('emits an approval event', async function () {
const { logs } = await this.token.decreaseApproval(spender, amount, { from: owner });

logs.length.should.eq(1);
logs[0].event.should.eq('Approval');
logs[0].args.owner.should.eq(owner);
logs[0].args.spender.should.eq(spender);
logs.length.should.equal(1);
logs[0].event.should.equal('Approval');
logs[0].args.owner.should.equal(owner);
logs[0].args.spender.should.equal(spender);
logs[0].args.value.should.be.bignumber.equal(0);
});
});
Expand All @@ -378,10 +378,10 @@ contract('StandardToken', function ([_, owner, recipient, anotherAccount]) {
it('emits an approval event', async function () {
const { logs } = await this.token.increaseApproval(spender, amount, { from: owner });

logs.length.should.eq(1);
logs[0].event.should.eq('Approval');
logs[0].args.owner.should.eq(owner);
logs[0].args.spender.should.eq(spender);
logs.length.should.equal(1);
logs[0].event.should.equal('Approval');
logs[0].args.owner.should.equal(owner);
logs[0].args.spender.should.equal(spender);
logs[0].args.value.should.be.bignumber.equal(amount);
});

Expand Down Expand Up @@ -412,10 +412,10 @@ contract('StandardToken', function ([_, owner, recipient, anotherAccount]) {
it('emits an approval event', async function () {
const { logs } = await this.token.increaseApproval(spender, amount, { from: owner });

logs.length.should.eq(1);
logs[0].event.should.eq('Approval');
logs[0].args.owner.should.eq(owner);
logs[0].args.spender.should.eq(spender);
logs.length.should.equal(1);
logs[0].event.should.equal('Approval');
logs[0].args.owner.should.equal(owner);
logs[0].args.spender.should.equal(spender);
logs[0].args.value.should.be.bignumber.equal(amount);
});

Expand Down Expand Up @@ -453,10 +453,10 @@ contract('StandardToken', function ([_, owner, recipient, anotherAccount]) {
it('emits an approval event', async function () {
const { logs } = await this.token.increaseApproval(spender, amount, { from: owner });

logs.length.should.eq(1);
logs[0].event.should.eq('Approval');
logs[0].args.owner.should.eq(owner);
logs[0].args.spender.should.eq(spender);
logs.length.should.equal(1);
logs[0].event.should.equal('Approval');
logs[0].args.owner.should.equal(owner);
logs[0].args.spender.should.equal(spender);
logs[0].args.value.should.be.bignumber.equal(amount);
});
});
Expand Down
10 changes: 5 additions & 5 deletions test/token/ERC20/TokenVesting.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ contract('TokenVesting', function ([_, owner, beneficiary]) {
const block = await ethGetBlock(receipt.blockNumber);
const releaseTime = block.timestamp;

(await this.token.balanceOf(beneficiary)).should.bignumber.eq(
(await this.token.balanceOf(beneficiary)).should.bignumber.equal(
amount.mul(releaseTime - this.start).div(this.duration).floor()
);
});
Expand All @@ -82,14 +82,14 @@ contract('TokenVesting', function ([_, owner, beneficiary]) {

await this.vesting.release(this.token.address);
const expectedVesting = amount.mul(now - this.start).div(this.duration).floor();
(await this.token.balanceOf(beneficiary)).should.bignumber.eq(expectedVesting);
(await this.token.balanceOf(beneficiary)).should.bignumber.equal(expectedVesting);
}
});

it('should have released all after end', async function () {
await increaseTimeTo(this.start + this.duration);
await this.vesting.release(this.token.address);
(await this.token.balanceOf(beneficiary)).should.bignumber.eq(amount);
(await this.token.balanceOf(beneficiary)).should.bignumber.equal(amount);
});

it('should be revoked by owner if revocable is set', async function () {
Expand All @@ -114,7 +114,7 @@ contract('TokenVesting', function ([_, owner, beneficiary]) {

await this.vesting.revoke(this.token.address, { from: owner });

(await this.token.balanceOf(owner)).should.bignumber.eq(amount.sub(vested));
(await this.token.balanceOf(owner)).should.bignumber.equal(amount.sub(vested));
});

it('should keep the vested tokens when revoked by owner', async function () {
Expand All @@ -126,7 +126,7 @@ contract('TokenVesting', function ([_, owner, beneficiary]) {

const vestedPost = await this.vesting.vestedAmount(this.token.address);

vestedPre.should.bignumber.eq(vestedPost);
vestedPre.should.bignumber.equal(vestedPost);
});

it('should fail to be revoked a second time', async function () {
Expand Down
2 changes: 1 addition & 1 deletion test/token/ERC721/ERC721BasicToken.behavior.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ function shouldBehaveLikeERC721BasicToken (accounts) {

(await this.token.tokenOfOwnerByIndex(this.to, 0)).toNumber().should.be.equal(tokenId);

(await this.token.tokenOfOwnerByIndex(owner, 0)).toNumber().should.not.be.eq(tokenId);
(await this.token.tokenOfOwnerByIndex(owner, 0)).toNumber().should.not.be.equal(tokenId);
});
};

Expand Down