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

resolved conflicts

Browse source
This commit is contained in:
Ivan Socolsky 2014-09-12 10:28:16 -03:00
commit 19a8733a9c
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
test/mocks/FakeWallet.js
View file

@ -84,6 +84,8 @@ FakeWallet.prototype.getAddressesInfo = function() {
return ret; return ret;
}; };
FakeWallet.prototype.subscribeToAddresses = function() {};
FakeWallet.prototype.isShared = function() { FakeWallet.prototype.isShared = function() {
return this.totalCopayers > 1; return this.totalCopayers > 1;
} }

6
test/unit/services/servicesSpec.js
View file

@ -113,7 +113,11 @@ describe('Unit: Rate Service', function() {
beforeEach(module(function($provide) { beforeEach(module(function($provide) {
$provide.value('request', { $provide.value('request', {
'get': function(_, cb) { 'get': function(_, cb) {
cb(null, null, [{name: 'lol currency', code: 'LOL', rate: 2}]); cb(null, null, [{
name: 'lol currency',
code: 'LOL',
rate: 2
}]);
} }
}); });
})); }));