replaced last opened with last focused wallet

This commit is contained in:
Ivan Socolsky 2014-10-20 18:33:21 -03:00 committed by Matias Alejo Garcia
commit 37526b554e
7 changed files with 46 additions and 38 deletions

View file

@ -134,6 +134,7 @@ describe('Identity model', function() {
profile.listWallets = sinon.stub().returns([{
id: 'walletid'
}]);
profile.getLastFocusedWallet = sinon.stub().returns(null);
Identity._openProfile = sinon.stub().callsArgWith(3, null, profile);
Identity._walletRead = sinon.stub().callsArgWith(2, null, wallet);
});
@ -147,7 +148,7 @@ describe('Identity model', function() {
});
});
it('should return last used wallet', function(done) {
it('should return last focused wallet', function(done) {
var wallets = [{
id: 'wallet1',
store: sinon.stub().yields(null),
@ -162,13 +163,14 @@ describe('Identity model', function() {
netStart: sinon.stub(),
}];
profile.listWallets = sinon.stub().returns(wallets);
profile.getLastFocusedWallet = sinon.stub().returns(wallets[1]);
Identity._walletRead = sinon.stub();
Identity._walletRead.onCall(0).callsArgWith(2, null, wallets[0]);
Identity._walletRead.onCall(1).callsArgWith(2, null, wallets[1]);
Identity._walletRead.onCall(2).callsArgWith(2, null, wallets[2]);
Identity.open(email, password, config, function(err, iden, w) {
w.id.should.equal('wallet1');
w.id.should.equal('wallet2');
done();
});
});
@ -270,12 +272,11 @@ describe('Identity model', function() {
Identity._walletRead = sinon.stub().callsArgWith(2, null, wallet);
});
it('should return wallet and call .store, .setLastOpenedTs & .migrateWallet', function(done) {
it('should return wallet and call .store & .migrateWallet', function(done) {
iden.openWallet('dummy', function(err, w) {
should.not.exist(err);
w.store.calledOnce.should.equal(true);
iden.profile.setLastOpenedTs.calledTwice.should.equal(true);
// iden.migrateWallet.calledOnce.should.equal(true);
done();
});

View file

@ -15,7 +15,7 @@ describe('Profile model', function() {
var storage = new FakeStorage();
var opts = {
email: email,
hash:hash,
hash: hash,
};
beforeEach(function() {
@ -87,7 +87,9 @@ describe('Profile model', function() {
describe('#addToWallet', function() {
it('should warn if wallet does not exist', function(done) {
var p = new Profile(opts, storage);
p.addToWallet('234',{1:1}, function(err) {
p.addToWallet('234', {
1: 1
}, function(err) {
err.toString().should.contain('WNOEXIST');
done();
});
@ -95,7 +97,9 @@ describe('Profile model', function() {
it('should add info to a wallet', function(done) {
var p = new Profile(opts, storage);
p.addWallet('234', {}, function(err) {
p.addToWallet('234',{'hola':1}, function(err) {
p.addToWallet('234', {
'hola': 1
}, function(err) {
var w = p.getWallet('234');
should.exist(w);
w.hola.should.equal(1);
@ -105,19 +109,19 @@ describe('Profile model', function() {
})
});
});
describe('#listWallets', function() {
it('should list wallets in order', function(done) {
var p = new Profile(opts, storage);
p.addWallet('123', {}, function(err) {
setTimeout(function() {
p.addWallet('234', {}, function(err) {
_.pluck(p.listWallets(), 'id').should.deep.equal(['234', '123']);
done();
})
},10);
setTimeout(function() {
p.addWallet('234', {}, function(err) {
_.pluck(p.listWallets(), 'id').should.deep.equal(['123', '234']);
done();
})
}, 10);
});
});
});