Fix tests

bitclave · Oct 20, 2017 · ab9d288 · ab9d288
1 parent ffd2fba
commit ab9d288
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 26 deletions.
diff --git a/test/BonusCrowdsale.js b/test/BonusCrowdsale.js
@@ -17,24 +17,24 @@ import EVMThrow from './helpers/EVMThrow';
 const Crowdsale = artifacts.require('./impl/BonusCrowdsaleImpl.sol');
 const Token = artifacts.require('zeppelin-solidity/contracts/token/MintableToken.sol');
 
-contract('BonusCrowdsale', async function ([_, wallet, wallet2, wallet3]) {
-
-    await advanceBlock();
-    var startTime = latestTime() + duration.weeks(1);
-    var endTime = startTime + duration.weeks(10);
-    var afterEndTime = endTime + duration.seconds(1);
+contract('BonusCrowdsale', function ([_, wallet, wallet2, wallet3]) {
 
     const rate = 5000;
+    var startTime;
+    var endTime;
+    var afterEndTime;
+
     var crowdsale;
     var token;
 
     // https://stackoverflow.com/questions/26107027/
     function makeSuite(name, tests) {
         describe(name, async function () {
             before(async function () {
-                startTime += duration.years(1);
-                endTime += duration.years(1);
-                afterEndTime += duration.years(1);
+                await advanceBlock();
+                startTime = latestTime() + duration.weeks(1);
+                endTime = startTime + duration.weeks(10);
+                afterEndTime = endTime + duration.seconds(1)
 
                 crowdsale = await Crowdsale.new(startTime, endTime, rate, wallet);
                 token = Token.at(await crowdsale.token.call());

diff --git a/test/PausableCrowdsale.js b/test/PausableCrowdsale.js
@@ -14,27 +14,30 @@ import {increaseTimeTo, duration} from './helpers/increaseTime';
 import latestTime from './helpers/latestTime';
 import EVMThrow from './helpers/EVMThrow';
 
-//const PausedCrowdsale = artifacts.require('./impl/PausableCrowdsaleImplPaused.sol');
-//const UnpausedCrowdsale = artifacts.require('./impl/PausableCrowdsaleImplUnpaused.sol');
+const PausedCrowdsale = artifacts.require('./impl/PausableCrowdsaleImplPaused.sol');
+const UnpausedCrowdsale = artifacts.require('./impl/PausableCrowdsaleImplUnpaused.sol');
 
-contract('PausableCrowdsale', async function ([_, wallet, wallet2, wallet3]) {
+contract('PausableCrowdsale', function ([_, wallet, wallet2, wallet3]) {
 
-    await advanceBlock();
-    // var startTime = latestTime() + duration.weeks(1);
-    // var endTime = startTime + duration.weeks(10);
-    // var afterEndTime = endTime + duration.seconds(1);
+    var pausedCrowdsale;
+    var unpausedCrowdsale;
 
-    // before(async function() {
-    //     const pausedCrowdsale = await PausedCrowdsale.new(startTime, endTime, 1, wallet);
-    //     const unpausedCrowdsale = await UnpausedCrowdsale.new(startTime, endTime, 1, wallet);
-    // })
+    before(async function() {
+        await advanceBlock();
+        var startTime = latestTime() + duration.weeks(1);
+        var endTime = startTime + duration.weeks(10);
+        var afterEndTime = endTime + duration.seconds(1);
 
-    // it('should be created paused', async function() {
-    //     (await pausedCrowdsale.paused.call()).should.be.true;
-    // })
+        pausedCrowdsale = await PausedCrowdsale.new(startTime, endTime, 1, wallet);
+        unpausedCrowdsale = await UnpausedCrowdsale.new(startTime, endTime, 1, wallet);
+    })
 
-    // it('should be created unpaused', async function() {
-    //     (await unpausedCrowdsale.paused.call()).should.be.false;
-    // })
+    it('should be created paused', async function() {
+        (await pausedCrowdsale.paused.call()).should.be.true;
+    })
+
+    it('should be created unpaused', async function() {
+        (await unpausedCrowdsale.paused.call()).should.be.false;
+    })
 
 })