anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Mocha tests fixed

Browse source
This commit is contained in:
Esteban Ordano 2014-10-23 17:26:32 -03:00 • committed by Matias Alejo Garcia
commit cf0b1b4df1
3 changed files with 27 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

38
js/models/Identity.js
View file

@ -155,15 +155,19 @@ Identity.create = function(email, password, opts, cb) {
if (err) {
return cb(err);
}
iden.pluginManager.get('remote-backup').store(
iden,
iden.insightSaveOpts,
function(error) {
// FIXME: Ignoring this error may not be the best thing to do. But remote storage
// is not required for the user to use the wallet.
return cb(null, iden, w);
}
);
if (iden.pluginManager.get && iden.pluginManager.get('remote-backup')) {
iden.pluginManager.get('remote-backup').store(
iden,
iden.insightSaveOpts,
function(error) {
// FIXME: Ignoring this error may not be the best thing to do. But remote storage
// is not required for the user to use the wallet.
return cb(null, iden, w);
}
);
} else {
return cb(null, iden, w);
}
});
});
};
@ -197,7 +201,11 @@ Identity.open = function(email, password, opts, cb) {
Identity._openProfile(email, password, iden.storage, function(err, profile) {
if (err) {
if (err.message && err.message.indexOf('PNOTFOUND') !== -1) {
return opts.pluginManager.get('remote-backup').retrieve(email, password, opts, cb);
if (opts.pluginManager && opts.pluginManager.get('remote-backup')) {
return opts.pluginManager.get('remote-backup').retrieve(email, password, opts, cb);
} else {
return cb(err);
}
}
return cb(err);
}
@ -492,11 +500,11 @@ Identity.prototype.createWallet = function(opts, cb) {
this.addWallet(w, function(err) {
if (err) return cb(err);
self.openWallets.push(w);
self.pluginManager.get('remote-backup').store(self, self.insightSaveOpts, function(error) {
// Ignore error
w.netStart();
return cb(null, w);
});
if (self.pluginManager.get && self.pluginManager.get('remote-backup')) {
self.pluginManager.get('remote-backup').store(self, self.insightSaveOpts, _.noop);
}
w.netStart();
return cb(null, w);
});
};

6
plugins/GoogleDrive.js
View file

@ -313,10 +313,4 @@ GoogleDrive.prototype.allKeys = function(cb) {
});
};
GoogleDrive.prototype.key = function(k) {
var v = localStorage.key(k);
return v;
};
module.exports = GoogleDrive;

8
test/Identity.js
View file

@ -351,7 +351,7 @@ describe('Identity model', function() {
});
it('should create an encrypted object', function() {
var ret = JSON.parse(iden.export());
var ret = JSON.parse(iden.exportAsJson());
ret.iterations.should.equal(13);
ret.profile.should.equal('penc');
_.each([0, 1, 2, 3, 4], function(i) {
@ -382,7 +382,7 @@ describe('Identity model', function() {
it('should check the import string', function(done) {
Identity.import(JSON.stringify({
Identity.importFromJson(JSON.stringify({
profile: '1234'
}), '1234', config, function(err, ret) {
err.should.contain('BADSTR');
@ -392,7 +392,7 @@ describe('Identity model', function() {
it('should check the import string 2', function(done) {
Identity.import(JSON.stringify({
Identity.importFromJson(JSON.stringify({
iterations: 10,
}), '1234', config, function(err, ret) {
err.should.contain('BADSTR');
@ -401,7 +401,7 @@ describe('Identity model', function() {
});
it('should import a simple wallet', function(done) {
Identity.import(JSON.stringify({
Identity.importFromJson(JSON.stringify({
iterations: 10,
profile: '1234'
}), '1234', config, function(err, iden) {