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

settings: fix angular test 4

This commit is contained in:
Manuel Araoz 2014-09-05 16:16:06 -07:00
parent 7277d29965
commit 2a976d2673
3 changed files with 28 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
js/controllers/send.js
View File

@ -1,17 +1,22 @@
'use strict'; 'use strict';
var bitcore = require('bitcore'); var bitcore = require('bitcore');
var preconditions = require('preconditions').singleton();
angular.module('copayApp.controllers').controller('SendController', angular.module('copayApp.controllers').controller('SendController',
function($scope, $rootScope, $window, $timeout, $anchorScroll, $modal, isMobile, notification, controllerUtils, rateService) { function($scope, $rootScope, $window, $timeout, $anchorScroll, $modal, isMobile, notification, controllerUtils, rateService) {
var w = $rootScope.wallet;
preconditions.checkState(w);
preconditions.checkState(w.settings.unitToSatoshi);
$scope.title = 'Send'; $scope.title = 'Send';
$scope.loading = false; $scope.loading = false;
var satToUnit = 1 / $rootScope.wallet.settings.unitToSatoshi; var satToUnit = 1 / w.settings.unitToSatoshi;
$scope.defaultFee = bitcore.TransactionBuilder.FEE_PER_1000B_SAT * satToUnit; $scope.defaultFee = bitcore.TransactionBuilder.FEE_PER_1000B_SAT * satToUnit;
$scope.unitToBtc = $rootScope.wallet.settings.unitToSatoshi / bitcore.util.COIN; $scope.unitToBtc = w.settings.unitToSatoshi / bitcore.util.COIN;
$scope.unitToSatoshi = $rootScope.wallet.settings.unitToSatoshi; $scope.unitToSatoshi = w.settings.unitToSatoshi;
$scope.alternativeName = $rootScope.wallet.settings.alternativeName; $scope.alternativeName = w.settings.alternativeName;
$scope.alternativeIsoCode = $rootScope.wallet.settings.alternativeIsoCode; $scope.alternativeIsoCode = w.settings.alternativeIsoCode;
$scope.isRateAvailable = false; $scope.isRateAvailable = false;
$scope.rateService = rateService; $scope.rateService = rateService;
@ -36,7 +41,7 @@ angular.module('copayApp.controllers').controller('SendController',
this._alternative = newValue; this._alternative = newValue;
if (typeof(newValue) === 'number' && $scope.isRateAvailable) { if (typeof(newValue) === 'number' && $scope.isRateAvailable) {
this._amount = parseFloat( this._amount = parseFloat(
(rateService.fromFiat(newValue, $rootScope.wallet.settings.alternativeIsoCode) * satToUnit).toFixed($rootScope.wallet.settings.unitDecimals), 10); (rateService.fromFiat(newValue, w.settings.alternativeIsoCode) * satToUnit).toFixed(w.settings.unitDecimals), 10);
} else { } else {
this._amount = 0; this._amount = 0;
} }
@ -53,7 +58,7 @@ angular.module('copayApp.controllers').controller('SendController',
this._amount = newValue; this._amount = newValue;
if (typeof(newValue) === 'number' && $scope.isRateAvailable) { if (typeof(newValue) === 'number' && $scope.isRateAvailable) {
this._alternative = parseFloat( this._alternative = parseFloat(
(rateService.toFiat(newValue * $rootScope.wallet.settings.unitToSatoshi, $rootScope.wallet.settings.alternativeIsoCode)).toFixed(2), 10); (rateService.toFiat(newValue * w.settings.unitToSatoshi, w.settings.alternativeIsoCode)).toFixed(2), 10);
} else { } else {
this._alternative = 0; this._alternative = 0;
} }
@ -75,7 +80,7 @@ angular.module('copayApp.controllers').controller('SendController',
} }
$scope.showAddressBook = function() { $scope.showAddressBook = function() {
var w = $rootScope.wallet; var w = w;
var flag; var flag;
if (w) { if (w) {
for (var k in w.addressBook) { for (var k in w.addressBook) {
@ -91,7 +96,7 @@ angular.module('copayApp.controllers').controller('SendController',
if ($rootScope.pendingPayment) { if ($rootScope.pendingPayment) {
var pp = $rootScope.pendingPayment; var pp = $rootScope.pendingPayment;
$scope.address = pp.address + ''; $scope.address = pp.address + '';
var amount = pp.data.amount / $rootScope.wallet.settings.unitToSatoshi * 100000000; var amount = pp.data.amount / w.settings.unitToSatoshi * 100000000;
$scope.amount = amount; $scope.amount = amount;
$scope.commentText = pp.data.message; $scope.commentText = pp.data.message;
} }
@ -113,10 +118,10 @@ angular.module('copayApp.controllers').controller('SendController',
$scope.loading = true; $scope.loading = true;
var address = form.address.$modelValue; var address = form.address.$modelValue;
var amount = parseInt((form.amount.$modelValue * $rootScope.wallet.settings.unitToSatoshi).toFixed(0)); var amount = parseInt((form.amount.$modelValue * w.settings.unitToSatoshi).toFixed(0));
var commentText = form.comment.$modelValue; var commentText = form.comment.$modelValue;
var w = $rootScope.wallet; var w = w;
function done(err, ntxid, merchantData) { function done(err, ntxid, merchantData) {
if (err) { if (err) {
@ -344,7 +349,7 @@ angular.module('copayApp.controllers').controller('SendController',
} }
$scope.toggleAddressBookEntry = function(key) { $scope.toggleAddressBookEntry = function(key) {
var w = $rootScope.wallet; var w = w;
w.toggleAddressBookEntry(key); w.toggleAddressBookEntry(key);
}; };
@ -379,7 +384,7 @@ angular.module('copayApp.controllers').controller('SendController',
}); });
modalInstance.result.then(function(entry) { modalInstance.result.then(function(entry) {
var w = $rootScope.wallet; var w = w;
$timeout(function() { $timeout(function() {
$scope.loading = false; $scope.loading = false;
@ -403,7 +408,7 @@ angular.module('copayApp.controllers').controller('SendController',
}; };
$scope.getAvailableAmount = function() { $scope.getAvailableAmount = function() {
var amount = ((($rootScope.availableBalance * $rootScope.wallet.settings.unitToSatoshi).toFixed(0) - bitcore.TransactionBuilder.FEE_PER_1000B_SAT) / $rootScope.wallet.settings.unitToSatoshi); var amount = ((($rootScope.availableBalance * w.settings.unitToSatoshi).toFixed(0) - bitcore.TransactionBuilder.FEE_PER_1000B_SAT) / w.settings.unitToSatoshi);
return amount > 0 ? amount : 0; return amount > 0 ? amount : 0;
}; };
@ -416,7 +421,7 @@ angular.module('copayApp.controllers').controller('SendController',
$scope.send = function(ntxid, cb) { $scope.send = function(ntxid, cb) {
$scope.loading = true; $scope.loading = true;
$rootScope.txAlertCount = 0; $rootScope.txAlertCount = 0;
var w = $rootScope.wallet; var w = w;
w.sendTx(ntxid, function(txid, merchantData) { w.sendTx(ntxid, function(txid, merchantData) {
if (!txid) { if (!txid) {
notification.error('Error', 'There was an error sending the transaction'); notification.error('Error', 'There was an error sending the transaction');
@ -441,7 +446,7 @@ angular.module('copayApp.controllers').controller('SendController',
$scope.sign = function(ntxid) { $scope.sign = function(ntxid) {
$scope.loading = true; $scope.loading = true;
var w = $rootScope.wallet; var w = w;
w.sign(ntxid, function(ret) { w.sign(ntxid, function(ret) {
if (!ret) { if (!ret) {
notification.error('Error', 'There was an error signing the transaction'); notification.error('Error', 'There was an error signing the transaction');
@ -461,7 +466,7 @@ angular.module('copayApp.controllers').controller('SendController',
$scope.reject = function(ntxid) { $scope.reject = function(ntxid) {
$scope.loading = true; $scope.loading = true;
$rootScope.txAlertCount = 0; $rootScope.txAlertCount = 0;
var w = $rootScope.wallet; var w = w;
w.reject(ntxid); w.reject(ntxid);
notification.warning('Transaction rejected', 'You rejected the transaction successfully'); notification.warning('Transaction rejected', 'You rejected the transaction successfully');
$scope.loading = false; $scope.loading = false;
@ -497,7 +502,7 @@ angular.module('copayApp.controllers').controller('SendController',
// Payment Protocol URI (BIP-72) // Payment Protocol URI (BIP-72)
scope.wallet.fetchPaymentTx(uri.merchant, function(err, merchantData) { scope.wallet.fetchPaymentTx(uri.merchant, function(err, merchantData) {
var balance = $rootScope.availableBalance; var balance = $rootScope.availableBalance;
var available = +(balance * $rootScope.wallet.settings.unitToSatoshi).toFixed(0); var available = +(balance * w.settings.unitToSatoshi).toFixed(0);
if (merchantData && available < +merchantData.total) { if (merchantData && available < +merchantData.total) {
err = new Error('No unspent outputs available.'); err = new Error('No unspent outputs available.');
@ -508,7 +513,7 @@ angular.module('copayApp.controllers').controller('SendController',
scope.sendForm.address.$isValid = false; scope.sendForm.address.$isValid = false;
if (err.amount) { if (err.amount) {
scope.sendForm.amount.$setViewValue(+err.amount / $rootScope.wallet.settings.unitToSatoshi); scope.sendForm.amount.$setViewValue(+err.amount / w.settings.unitToSatoshi);
scope.sendForm.amount.$render(); scope.sendForm.amount.$render();
scope.sendForm.amount.$isValid = false; scope.sendForm.amount.$isValid = false;
scope.notEnoughAmount = true; scope.notEnoughAmount = true;
@ -538,7 +543,7 @@ angular.module('copayApp.controllers').controller('SendController',
var url = merchantData.request_url; var url = merchantData.request_url;
var domain = /^(?:https?)?:\/\/([^\/:]+).*$/.exec(url)[1]; var domain = /^(?:https?)?:\/\/([^\/:]+).*$/.exec(url)[1];
merchantData.unitTotal = (+merchantData.total / $rootScope.wallet.settings.unitToSatoshi) + ''; merchantData.unitTotal = (+merchantData.total / w.settings.unitToSatoshi) + '';
merchantData.expiration = new Date( merchantData.expiration = new Date(
merchantData.pr.pd.expires * 1000).toISOString(); merchantData.pr.pd.expires * 1000).toISOString();
merchantData.domain = domain; merchantData.domain = domain;
@ -588,7 +593,7 @@ angular.module('copayApp.controllers').controller('SendController',
notification.info('Payment Request', notification.info('Payment Request',
'Server is requesting ' + merchantData.unitTotal + 'Server is requesting ' + merchantData.unitTotal +
' ' + $rootScope.wallet.settings.unitName + ' ' + w.settings.unitName +
'.' + ' Message: ' + merchantData.pr.pd.memo); '.' + ' Message: ' + merchantData.pr.pd.memo);
}); });
}; };

1
test/unit/controllers/controllersSpec.js
View File

@ -384,6 +384,7 @@ describe("Unit: Controllers", function() {
beforeEach(inject(function($compile, $rootScope, $controller) { beforeEach(inject(function($compile, $rootScope, $controller) {
scope = $rootScope.$new(); scope = $rootScope.$new();
$rootScope.availableBalance = 123456; $rootScope.availableBalance = 123456;
$rootScope.wallet = new FakeWallet(walletConfig);
var element = angular.element( var element = angular.element(
'<form name="form">' + '<form name="form">' +

1
test/unit/services/servicesSpec.js
View File

@ -4,6 +4,7 @@
// //
// //
var sinon = require('sinon'); var sinon = require('sinon');
var preconditions = require('preconditions').singleton();
describe("Unit: Walletfactory Service", function() { describe("Unit: Walletfactory Service", function() {
beforeEach(angular.mock.module('copayApp.services')); beforeEach(angular.mock.module('copayApp.services'));