BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Test fixed and added error checks

This commit is contained in:
Matias Pando 2014-12-02 17:46:31 -03:00
parent 0712300580
commit c7590c2d33
2 changed files with 24 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
js/models/Wallet.js
View File

@ -2550,13 +2550,10 @@ Wallet.prototype.isComplete = function() {
Wallet.prototype.getTransactionHistoryCsv = function(cb) {
var self = this;
self.getTransactionHistory(function(err, res) {
preconditions.checkState(res);
if (err) {
log.debug(err);
return cb('ERROR');
}
if (!res) {
return cb('ERROR');
log.warn(err);
return cb(new Error('TXHISTORY: ' + err.toString()));
}
var unit = self.settings.unitName;
@ -2573,7 +2570,7 @@ Wallet.prototype.getTransactionHistoryCsv = function(cb) {
data.forEach(function(it, index) {
if (!it) {
return cb('ERROR');
return cb(new Error('TXHISTORY: The item is null'));
}
var dataString = formatDate(it.minedTs || it.sentTs) + ',' + it.amount + ',' + it.action + ',' + formatString(it.addressTo) + ',' + formatString(it.comment);
if (self.isShared() && it.actionList) {
@ -2589,7 +2586,7 @@ Wallet.prototype.getTransactionHistoryCsv = function(cb) {
function formatDate(date) {
var dateObj = new Date(date);
if (!dateObj) {
log.error('Error formating a date');
log.warn('Error formating a date');
return 'DateError'
}
if (!dateObj.toJSON()) {

47
test/Wallet.js
View File

@ -2391,14 +2391,6 @@ describe('Wallet model', function() {
items: txs,
totalItems: txs.length,
});
w.getAddressesInfo = sinon.stub().returns([{
addressStr: 'addr_in_1'
}, {
addressStr: 'addr_in_2'
}, {
addressStr: 'change',
isChange: true,
}]);
w.addressBook = {
'addr_out_1': {
@ -2441,14 +2433,6 @@ describe('Wallet model', function() {
items: txs,
totalItems: txs.length,
});
w.getAddressesInfo = sinon.stub().returns([{
addressStr: 'addr_in_1'
}, {
addressStr: 'addr_in_2'
}, {
addressStr: 'change',
isChange: true,
}]);
w.txProposals.txps = [{
sentTxid: 'id0',
@ -2490,37 +2474,37 @@ describe('Wallet model', function() {
var w = cachedCreateW2();
var txs = [{
vin: [{
addr: 'addr_in_1',
addr: 'in_1',
valueSat: 1000
}],
vout: [{
scriptPubKey: {
addresses: ['addr_out_1'],
addresses: ['out_1'],
},
value: '0.00000900',
}],
fees: 0.00000100
}, {
vin: [{
addr: 'addr_in_2',
addr: 'in_2',
valueSat: 2000
}],
vout: [{
scriptPubKey: {
addresses: ['addr_out_2'],
addresses: ['out_2'],
},
value: '0.00001900',
}],
fees: 0.00000100
}, {
vin: [{
addr: 'addr_in_1',
addr: 'in_3',
valueSat: 3000
}],
vout: [{
scriptPubKey: {
addresses: ['addr_out_2'],
addresses: ['out_3'],
},
value: '0.00002900',
@ -2532,15 +2516,22 @@ describe('Wallet model', function() {
items: txs,
totalItems: txs.length,
});
w.getAddressesInfo = sinon.stub().returns([{
addressStr: 'addr_in_1'
}, {
addressStr: 'addr_out_2'
}]);
sinon.stub(w, 'getAddresses').returns(['in_1', 'in_2', 'in_3', 'out_1', 'out_2', 'out_3']);
var s = sinon.stub(w.publicKeyRing, 'addressIsOwn');
s.withArgs('in_1').returns(true);
s.withArgs('out_1').returns(false);
s.withArgs('in_2').returns(false);
s.withArgs('out_2').returns(true);
s.withArgs('in_3').returns(true);
s.withArgs('out_3').returns(true);
w.getTransactionHistoryCsv(function(data) {
data.should.exist;
data.should.equal('data:text/csv;charset=utf-8,Date,Amount(bits),Action,AddressTo,Comment,Signers\n,9,sent,"addr_out_1",\n,19,received,,\n,29,moved,"addr_out_2",\n');
data.should.equal('data:text/csv;charset=utf-8,Date,Amount(bits),Action,AddressTo,Comment,Signers\n,9,sent,"out_1",\n,0,moved,"out_2",\n,29,sent,"out_3",\n');
done();
});
});