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

Merge pull request #1460 from cmgustavo/bug/01-import

Browse source 
Trying to import a wallet with a wrong password
This commit is contained in:
Matias Alejo Garcia 2014-09-25 07:51:23 -03:00
commit c360fbb926
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
js/models/WalletFactory.js
View file

@ -136,10 +136,7 @@ WalletFactory.prototype.fromEncryptedObj = function(base64, passphrase, skipFiel
*/
WalletFactory.prototype.import = function(base64, passphrase, skipFields) {
var self = this;
var w = self.fromEncryptedObj(base64, passphrase, skipFields);
if (!w) throw new Error('Wrong passphrase');
return w;
return self.fromEncryptedObj(base64, passphrase, skipFields);
};
/**

8
test/test.WalletFactory.js
View file

@ -179,11 +179,11 @@ describe('WalletFactory model', function() {
should.exist(w);
wallet.should.equal(w);
});
it('should import with a wrong password', function() {
wf.fromEncryptedObj = sinon.stub().returns(null);
(function() {
wf.import("encrypted", "password")
}).should.throw();
var w = wf.import("encrypted", "passwordasdfasdf");
should.not.exist(w);
});
});

3
test/unit/controllers/controllersSpec.js
View file

@ -457,6 +457,9 @@ describe("Unit: Controllers", function() {
it('should exist', function() {
should.exist(what);
});
it('import status', function() {
expect(scope.importStatus).equal('Importing wallet - Reading backup...');
});
});
describe('Open Controller', function() {