embarklabs/embark
2
0
Fork 0
mirror of https://github.com/embarklabs/embark.git synced 2025-01-24 20:51:55 +00:00
Code Issues Projects Releases Wiki Activity

fix(@embark/tests): Improve expiration unit test

Browse Source 
Improve the reliability of the expiration unit test in the test dapp by explicitly setting the `block.timestamp` and comparing an expiration value against that.

This improves on the current implementation that relies on time passed which varies depending on the speed of unit tests run (CPU speed, logs shown, etc).
This commit is contained in:
emizzle 2019-11-21 15:33:31 +11:00 committed by Pascal Precht
parent 6f9e82d8b9
commit 23e94d6197
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dapps/tests/app/app/contracts/expiration.sol
View File

@ -1,7 +1,7 @@
pragma solidity ^0.4.25; pragma solidity ^0.4.25;
contract Expiration { contract Expiration {
uint public expirationTime; // In milliseconds uint256 public expirationTime; // Unix epoch (seconds since 1/1/1970)
address owner; address owner;
constructor(uint expiration) public { constructor(uint expiration) public {
@ -9,8 +9,7 @@ contract Expiration {
} }
function isExpired() public view returns (bool retVal) { function isExpired() public view returns (bool retVal) {
// retVal = block.timestamp; retVal = block.timestamp > expirationTime;
retVal = expirationTime < block.timestamp * 1000;
return retVal; return retVal;
} }
} }

7
dapps/tests/app/test/expiration_spec.js
View File

@ -1,11 +1,12 @@
/*global contract, config, it, assert, increaseTime*/ /*global contract, config, it, assert, mineAtTimestamp*/
const Expiration = require('Embark/contracts/Expiration'); const Expiration = require('Embark/contracts/Expiration');
const now = Math.floor(new Date().getTime()/1000.0); // Get unix epoch. The getTime method returns the time in milliseconds.
config({ config({
contracts: { contracts: {
deploy: { deploy: {
"Expiration": { "Expiration": {
args: [Date.now() + 5000] args: [now + 1000]
} }
} }
} }
@ -18,7 +19,7 @@ contract("Expiration", function() {
}); });
it("should have expired after skipping time", async function () { it("should have expired after skipping time", async function () {
await increaseTime(5001); await mineAtTimestamp(now + 1001); // sets block.timestamp to 1001
const isExpired = await Expiration.methods.isExpired().call(); const isExpired = await Expiration.methods.isExpired().call();
assert.strictEqual(isExpired, true); assert.strictEqual(isExpired, true);
}); });

6
packages/stack/test-runner/src/lib/index.js
View File

@ -161,6 +161,12 @@ class TestRunner {
await this.evmMethod("evm_increaseTime", [Number(amount)]); await this.evmMethod("evm_increaseTime", [Number(amount)]);
await this.evmMethod("evm_mine"); await this.evmMethod("evm_mine");
}; };
// Mines a block and sets block.timestamp accordingly.
// See https://github.com/trufflesuite/ganache-core/pull/13 for more information
global.mineAtTimestamp = async (timestamp) => {
return this.evmMethod("evm_mine", [parseFloat(timestamp)]);
};
} }
generateCoverageReport() { generateCoverageReport() {