From ce25e2db987089e6903a73091925253dac4fa1c0 Mon Sep 17 00:00:00 2001 From: Manuel Araoz Date: Mon, 20 Mar 2017 11:58:56 -0300 Subject: [PATCH 1/2] try to fix travis 1 --- test/StandardToken.js | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/test/StandardToken.js b/test/StandardToken.js index 96cda8b3e..c9bad8ead 100644 --- a/test/StandardToken.js +++ b/test/StandardToken.js @@ -1,26 +1,28 @@ +'use strict'; + const assertJump = require('./helpers/assertJump'); -var StandardTokenMock = artifacts.require("./helpers/StandardTokenMock.sol"); +var StandardTokenMock = artifacts.require('./helpers/StandardTokenMock.sol'); contract('StandardToken', function(accounts) { - it("should return the correct totalSupply after construction", async function() { + it('should return the correct totalSupply after construction', async function() { let token = await StandardTokenMock.new(accounts[0], 100); let totalSupply = await token.totalSupply(); assert.equal(totalSupply, 100); - }) + }); - it("should return the correct allowance amount after approval", async function() { + it.only('should return the correct allowance amount after approval', async function() { let token = await StandardTokenMock.new(); - let approve = await token.approve(accounts[1], 100); + await token.approve(accounts[1], 100); let allowance = await token.allowance(accounts[0], accounts[1]); assert.equal(allowance, 100); }); - it("should return correct balances after transfer", async function() { + it('should return correct balances after transfer', async function() { let token = await StandardTokenMock.new(accounts[0], 100); - let transfer = await token.transfer(accounts[1], 100); + await token.transfer(accounts[1], 100); let balance0 = await token.balanceOf(accounts[0]); assert.equal(balance0, 0); @@ -28,20 +30,20 @@ contract('StandardToken', function(accounts) { assert.equal(balance1, 100); }); - it("should throw an error when trying to transfer more than balance", async function() { + it('should throw an error when trying to transfer more than balance', async function() { let token = await StandardTokenMock.new(accounts[0], 100); try { - let transfer = await token.transfer(accounts[1], 101); + await token.transfer(accounts[1], 101); } catch(error) { return assertJump(error); } assert.fail('should have thrown before'); }); - it("should return correct balances after transfering from another account", async function() { + it('should return correct balances after transfering from another account', async function() { let token = await StandardTokenMock.new(accounts[0], 100); - let approve = await token.approve(accounts[1], 100); - let transferFrom = await token.transferFrom(accounts[0], accounts[2], 100, {from: accounts[1]}); + await token.approve(accounts[1], 100); + await token.transferFrom(accounts[0], accounts[2], 100, {from: accounts[1]}); let balance0 = await token.balanceOf(accounts[0]); assert.equal(balance0, 0); @@ -53,11 +55,11 @@ contract('StandardToken', function(accounts) { assert.equal(balance2, 0); }); - it("should throw an error when trying to transfer more than allowed", async function() { + it('should throw an error when trying to transfer more than allowed', async function() { let token = await StandardTokenMock.new(); - let approve = await token.approve(accounts[1], 99); + await token.approve(accounts[1], 99); try { - let transfer = await token.transferFrom(accounts[0], accounts[2], 100, {from: accounts[1]}); + await token.transferFrom(accounts[0], accounts[2], 100, {from: accounts[1]}); } catch (error) { return assertJump(error); } From 960500a0785a4ec1a845525c11075514589b0c6b Mon Sep 17 00:00:00 2001 From: Manuel Araoz Date: Mon, 20 Mar 2017 15:19:14 -0300 Subject: [PATCH 2/2] try to fix travis 2 --- test/StandardToken.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/StandardToken.js b/test/StandardToken.js index c9bad8ead..e3f578726 100644 --- a/test/StandardToken.js +++ b/test/StandardToken.js @@ -12,7 +12,7 @@ contract('StandardToken', function(accounts) { assert.equal(totalSupply, 100); }); - it.only('should return the correct allowance amount after approval', async function() { + it('should return the correct allowance amount after approval', async function() { let token = await StandardTokenMock.new(); await token.approve(accounts[1], 100); let allowance = await token.allowance(accounts[0], accounts[1]);