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

Merge pull request #67 from se3000/fresh_fixtures

Browse Source 
Move away from migration fixtures in tests
This commit is contained in:
Manuel Aráoz
2016-11-14 14:21:38 -03:00
committed by GitHub
parent a3362f7216 a156064b33
commit d7b38038ad
2 changed files with 37 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
test/Claimable.js
View File

@ -1,7 +1,13 @@
contract('Claimable', function(accounts) {
var claimable;
beforeEach(function() {
return Claimable.new().then(function(deployed) {
claimable = deployed;
});
});
it("should have an owner", function(done) {
var claimable = Claimable.deployed();
return claimable.owner()
.then(function(owner) {
assert.isTrue(owner != 0);
@ -10,19 +16,18 @@ contract('Claimable', function(accounts) {
});
it("changes pendingOwner after transfer", function(done) {
var claimable = Claimable.deployed();
return claimable.transfer(accounts[1])
var newOwner = accounts[1];
return claimable.transfer(newOwner)
.then(function() {
return claimable.pendingOwner();
})
.then(function(pendingOwner) {
assert.isTrue(pendingOwner === accounts[1]);
assert.isTrue(pendingOwner === newOwner);
})
.then(done)
});
it("should prevent to claimOwnership from no pendingOwner", function(done) {
var claimable = Claimable.deployed();
return claimable.claimOwnership({from: accounts[2]})
.then(function() {
return claimable.owner();
@ -33,20 +38,7 @@ contract('Claimable', function(accounts) {
.then(done)
});
it("changes allow pending owner to claim ownership", function(done) {
var claimable = Claimable.deployed();
return claimable.claimOwnership({from: accounts[1]})
.then(function() {
return claimable.owner();
})
.then(function(owner) {
assert.isTrue(owner === accounts[1]);
})
.then(done)
});
it("should prevent non-owners from transfering" ,function(done) {
var claimable = Claimable.deployed();
return claimable.transfer(accounts[2], {from: accounts[2]})
.then(function() {
return claimable.pendingOwner();
@ -57,4 +49,23 @@ contract('Claimable', function(accounts) {
.then(done)
});
describe("after initiating a transfer", function () {
var newOwner;
beforeEach(function () {
newOwner = accounts[1];
return claimable.transfer(newOwner);
});
it("changes allow pending owner to claim ownership", function(done) {
return claimable.claimOwnership({from: newOwner})
.then(function() {
return claimable.owner();
})
.then(function(owner) {
assert.isTrue(owner === newOwner);
})
.then(done)
});
});
});

11
test/Ownable.js
View File

@ -1,6 +1,13 @@
contract('Ownable', function(accounts) {
var ownable;
beforeEach(function() {
return Ownable.new().then(function(deployed) {
ownable = deployed;
});
});
it("should have an owner", function(done) {
var ownable = Ownable.deployed();
return ownable.owner()
.then(function(owner) {
assert.isTrue(owner != 0);
@ -9,7 +16,6 @@ contract('Ownable', function(accounts) {
});
it("changes owner after transfer", function(done) {
var ownable = Ownable.deployed();
var other = accounts[1];
return ownable.transfer(other)
.then(function() {
@ -22,7 +28,6 @@ contract('Ownable', function(accounts) {
});
it("should prevent non-owners from transfering" ,function(done) {
var ownable = Ownable.deployed();
var other = accounts[2];
return ownable.transfer(other, {from: accounts[2]})
.then(function() {