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

fix conflics

Browse source
This commit is contained in:
Matias Alejo Garcia 2014-04-24 23:42:59 -03:00
commit 46fa0e518c
4 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
API.js
View file

@ -169,13 +169,13 @@ API.prototype.getCommands = decorate('getCommands', [
['callback', 'function'] ['callback', 'function']
]); ]);
API.prototype._cmd_getWalletIds = function(callback) { API.prototype._cmd_getWallets = function(callback) {
var self = this; var self = this;
return callback(null, self.walletFactory.getWalletIds()); return callback(null, self.walletFactory.getWallets());
}; };
API.prototype.getWalletIds = decorate('getWalletIds', [ API.prototype.getWallets = decorate('getWallets', [
['callback', 'function'] ['callback', 'function']
]); ]);

2
test/mocks/FakeStorage.js
View file

@ -23,7 +23,7 @@ FakeStorage.prototype.clear = function() {
delete this['storage']; delete this['storage'];
} }
FakeStorage.prototype.getWalletIds = function() { FakeStorage.prototype.getWallets = function() {
return []; return [];
}; };

4
test/test.API.js
View file

@ -110,10 +110,10 @@ describe('API', function() {
}); });
}); });
describe('#getWalletIds', function() { describe('#getWallets', function() {
it('should get the wallet ids', function(done) { it('should get the wallet ids', function(done) {
var api = new API({Storage: Storage}); var api = new API({Storage: Storage});
api.getWalletIds(function(err, result) { api.getWallets(function(err, result) {
result.length.should.be.greaterThan(-1); result.length.should.be.greaterThan(-1);
done(); done();
}); });

2
test/test.Wallet.js
View file

@ -5,7 +5,7 @@ var should = chai.should();
var copay = copay || require('../copay'); var copay = copay || require('../copay');
var Wallet = require('../js/models/core/Wallet'); var Wallet = require('../js/models/core/Wallet');
var Storage= require('./mocks/FakeStorage'); var Storage= require('./mocks/FakeStorage');
var Network= copay.WebRTC; var Network= require('./mocks/FakeNetwork');
var Blockchain= copay.Insight; var Blockchain= copay.Insight;
var addCopayers = function (w) { var addCopayers = function (w) {