From e4e2921f3efd373b916a68fde7a866fb1c345e79 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 28 Jun 2015 08:24:12 +0200 Subject: [PATCH] Fixed some tests. --- .../Chart/Account/AccountChartGenerator.php | 2 +- .../Account/ChartJsAccountChartGenerator.php | 2 +- .../Account/GoogleAccountChartGenerator.php | 2 +- .../Chart/Bill/BillChartGenerator.php | 2 +- .../Chart/Bill/ChartJsBillChartGenerator.php | 2 +- .../Chart/Bill/GoogleBillChartGenerator.php | 2 +- .../Chart/Budget/BudgetChartGenerator.php | 2 +- .../Budget/ChartJsBudgetChartGenerator.php | 2 +- .../Budget/GoogleBudgetChartGenerator.php | 2 +- .../Chart/Category/CategoryChartGenerator.php | 2 +- .../ChartJsCategoryChartGenerator.php | 2 +- .../Category/GoogleCategoryChartGenerator.php | 2 +- .../ChartJsPiggyBankChartGenerator.php | 2 +- .../GooglePiggyBankChartGenerator.php | 2 +- .../PiggyBank/PiggyBankChartGenerator.php | 2 +- .../Report/ChartJsReportChartGenerator.php | 2 +- .../Report/GoogleReportChartGenerator.php | 2 +- .../Chart/Report/ReportChartGenerator.php | 2 +- public/js/budgets.js | 135 +----------------- resources/twig/index.twig | 2 +- tests/controllers/AccountControllerTest.php | 4 + tests/controllers/BillControllerTest.php | 4 + tests/controllers/BudgetControllerTest.php | 5 + tests/controllers/CategoryControllerTest.php | 3 + tests/controllers/HomeControllerTest.php | 1 + tests/controllers/JsonControllerTest.php | 4 + tests/controllers/NewUserControllerTest.php | 2 + tests/controllers/PiggyBankControllerTest.php | 4 + .../controllers/PreferencesControllerTest.php | 1 + .../controllers/TransactionControllerTest.php | 1 + 30 files changed, 49 insertions(+), 153 deletions(-) diff --git a/app/Generator/Chart/Account/AccountChartGenerator.php b/app/Generator/Chart/Account/AccountChartGenerator.php index b43145f761..8a019d155e 100644 --- a/app/Generator/Chart/Account/AccountChartGenerator.php +++ b/app/Generator/Chart/Account/AccountChartGenerator.php @@ -40,4 +40,4 @@ interface AccountChartGenerator * @return array */ public function single(Account $account, Carbon $start, Carbon $end); -} \ No newline at end of file +} diff --git a/app/Generator/Chart/Account/ChartJsAccountChartGenerator.php b/app/Generator/Chart/Account/ChartJsAccountChartGenerator.php index f1ef92aa97..74afc56272 100644 --- a/app/Generator/Chart/Account/ChartJsAccountChartGenerator.php +++ b/app/Generator/Chart/Account/ChartJsAccountChartGenerator.php @@ -110,4 +110,4 @@ class ChartJsAccountChartGenerator implements AccountChartGenerator return $data; } -} \ No newline at end of file +} diff --git a/app/Generator/Chart/Account/GoogleAccountChartGenerator.php b/app/Generator/Chart/Account/GoogleAccountChartGenerator.php index 02e238a964..3859175b3d 100644 --- a/app/Generator/Chart/Account/GoogleAccountChartGenerator.php +++ b/app/Generator/Chart/Account/GoogleAccountChartGenerator.php @@ -119,4 +119,4 @@ class GoogleAccountChartGenerator implements AccountChartGenerator return $chart->getData(); } -} \ No newline at end of file +} diff --git a/app/Generator/Chart/Bill/BillChartGenerator.php b/app/Generator/Chart/Bill/BillChartGenerator.php index 6f57bfa724..46bbbf25ea 100644 --- a/app/Generator/Chart/Bill/BillChartGenerator.php +++ b/app/Generator/Chart/Bill/BillChartGenerator.php @@ -29,4 +29,4 @@ interface BillChartGenerator */ public function frontpage(Collection $paid, Collection $unpaid); -} \ No newline at end of file +} diff --git a/app/Generator/Chart/Bill/ChartJsBillChartGenerator.php b/app/Generator/Chart/Bill/ChartJsBillChartGenerator.php index 2255c65632..5fd08c24ec 100644 --- a/app/Generator/Chart/Bill/ChartJsBillChartGenerator.php +++ b/app/Generator/Chart/Bill/ChartJsBillChartGenerator.php @@ -80,4 +80,4 @@ class ChartJsBillChartGenerator implements BillChartGenerator public function single(Bill $bill, Collection $entries) { } -} \ No newline at end of file +} diff --git a/app/Generator/Chart/Bill/GoogleBillChartGenerator.php b/app/Generator/Chart/Bill/GoogleBillChartGenerator.php index eedf14f77f..8864bb8306 100644 --- a/app/Generator/Chart/Bill/GoogleBillChartGenerator.php +++ b/app/Generator/Chart/Bill/GoogleBillChartGenerator.php @@ -84,4 +84,4 @@ class GoogleBillChartGenerator implements BillChartGenerator return $chart->getData(); } -} \ No newline at end of file +} diff --git a/app/Generator/Chart/Budget/BudgetChartGenerator.php b/app/Generator/Chart/Budget/BudgetChartGenerator.php index 2a9033ed00..552a8b2933 100644 --- a/app/Generator/Chart/Budget/BudgetChartGenerator.php +++ b/app/Generator/Chart/Budget/BudgetChartGenerator.php @@ -40,4 +40,4 @@ interface BudgetChartGenerator */ public function year(Collection $budgets, Collection $entries); -} \ No newline at end of file +} diff --git a/app/Generator/Chart/Budget/ChartJsBudgetChartGenerator.php b/app/Generator/Chart/Budget/ChartJsBudgetChartGenerator.php index 49f9fbf694..149c3e797f 100644 --- a/app/Generator/Chart/Budget/ChartJsBudgetChartGenerator.php +++ b/app/Generator/Chart/Budget/ChartJsBudgetChartGenerator.php @@ -138,4 +138,4 @@ class ChartJsBudgetChartGenerator implements BudgetChartGenerator return $data; } -} \ No newline at end of file +} diff --git a/app/Generator/Chart/Budget/GoogleBudgetChartGenerator.php b/app/Generator/Chart/Budget/GoogleBudgetChartGenerator.php index ab4358a71d..858859f18d 100644 --- a/app/Generator/Chart/Budget/GoogleBudgetChartGenerator.php +++ b/app/Generator/Chart/Budget/GoogleBudgetChartGenerator.php @@ -107,4 +107,4 @@ class GoogleBudgetChartGenerator implements BudgetChartGenerator return $chart->getData(); } -} \ No newline at end of file +} diff --git a/app/Generator/Chart/Category/CategoryChartGenerator.php b/app/Generator/Chart/Category/CategoryChartGenerator.php index bd0a30e5e7..16c04a48bd 100644 --- a/app/Generator/Chart/Category/CategoryChartGenerator.php +++ b/app/Generator/Chart/Category/CategoryChartGenerator.php @@ -41,4 +41,4 @@ interface CategoryChartGenerator * @return array */ public function year(Collection $categories, Collection $entries); -} \ No newline at end of file +} diff --git a/app/Generator/Chart/Category/ChartJsCategoryChartGenerator.php b/app/Generator/Chart/Category/ChartJsCategoryChartGenerator.php index 2908967928..91a8aef3e7 100644 --- a/app/Generator/Chart/Category/ChartJsCategoryChartGenerator.php +++ b/app/Generator/Chart/Category/ChartJsCategoryChartGenerator.php @@ -112,4 +112,4 @@ class ChartJsCategoryChartGenerator implements CategoryChartGenerator return $data; } -} \ No newline at end of file +} diff --git a/app/Generator/Chart/Category/GoogleCategoryChartGenerator.php b/app/Generator/Chart/Category/GoogleCategoryChartGenerator.php index db270dbe85..6100358927 100644 --- a/app/Generator/Chart/Category/GoogleCategoryChartGenerator.php +++ b/app/Generator/Chart/Category/GoogleCategoryChartGenerator.php @@ -101,4 +101,4 @@ class GoogleCategoryChartGenerator implements CategoryChartGenerator return $chart->getData(); } -} \ No newline at end of file +} diff --git a/app/Generator/Chart/PiggyBank/ChartJsPiggyBankChartGenerator.php b/app/Generator/Chart/PiggyBank/ChartJsPiggyBankChartGenerator.php index 74ac83a2d1..1117272c57 100644 --- a/app/Generator/Chart/PiggyBank/ChartJsPiggyBankChartGenerator.php +++ b/app/Generator/Chart/PiggyBank/ChartJsPiggyBankChartGenerator.php @@ -49,4 +49,4 @@ class ChartJsPiggyBankChartGenerator implements PiggyBankChartGenerator return $data; } -} \ No newline at end of file +} diff --git a/app/Generator/Chart/PiggyBank/GooglePiggyBankChartGenerator.php b/app/Generator/Chart/PiggyBank/GooglePiggyBankChartGenerator.php index 22f4639d18..15d6eb9931 100644 --- a/app/Generator/Chart/PiggyBank/GooglePiggyBankChartGenerator.php +++ b/app/Generator/Chart/PiggyBank/GooglePiggyBankChartGenerator.php @@ -38,4 +38,4 @@ class GooglePiggyBankChartGenerator implements PiggyBankChartGenerator return $chart->getData(); } -} \ No newline at end of file +} diff --git a/app/Generator/Chart/PiggyBank/PiggyBankChartGenerator.php b/app/Generator/Chart/PiggyBank/PiggyBankChartGenerator.php index 6f7b48a149..5655bcb4e8 100644 --- a/app/Generator/Chart/PiggyBank/PiggyBankChartGenerator.php +++ b/app/Generator/Chart/PiggyBank/PiggyBankChartGenerator.php @@ -17,4 +17,4 @@ interface PiggyBankChartGenerator * @return array */ public function history(Collection $set); -} \ No newline at end of file +} diff --git a/app/Generator/Chart/Report/ChartJsReportChartGenerator.php b/app/Generator/Chart/Report/ChartJsReportChartGenerator.php index de51c0e6f2..5fb15ffc44 100644 --- a/app/Generator/Chart/Report/ChartJsReportChartGenerator.php +++ b/app/Generator/Chart/Report/ChartJsReportChartGenerator.php @@ -84,4 +84,4 @@ class ChartJsReportChartGenerator implements ReportChartGenerator $data['datasets'][1]['data'][] = round(($expense / $count), 2); return $data; } -} \ No newline at end of file +} diff --git a/app/Generator/Chart/Report/GoogleReportChartGenerator.php b/app/Generator/Chart/Report/GoogleReportChartGenerator.php index f5c519c97a..f995596687 100644 --- a/app/Generator/Chart/Report/GoogleReportChartGenerator.php +++ b/app/Generator/Chart/Report/GoogleReportChartGenerator.php @@ -55,4 +55,4 @@ class GoogleReportChartGenerator implements ReportChartGenerator return $chart->getData(); } -} \ No newline at end of file +} diff --git a/app/Generator/Chart/Report/ReportChartGenerator.php b/app/Generator/Chart/Report/ReportChartGenerator.php index 623fa7e93a..7e3c3039b0 100644 --- a/app/Generator/Chart/Report/ReportChartGenerator.php +++ b/app/Generator/Chart/Report/ReportChartGenerator.php @@ -28,4 +28,4 @@ interface ReportChartGenerator */ public function yearInOutSummarized($income, $expense, $count); -} \ No newline at end of file +} diff --git a/public/js/budgets.js b/public/js/budgets.js index 7dfc788244..635942d1df 100644 --- a/public/js/budgets.js +++ b/public/js/budgets.js @@ -95,11 +95,6 @@ $(function () { $('input[type="number"]').on('input', updateBudgetedAmounts); - //updateRanges(); - //$('input[type="range"]').on('input', updateSingleRange); - //$('input[type="number"]').on('input', updateSingleRange); - - /* Draw the charts, if necessary: */ @@ -112,87 +107,7 @@ $(function () { }); - -//function updateSingleRange(e) { -// "use strict"; -// // get some values: -// var input = $(e.target); -// var id = input.data('id'); -// var value = parseInt(input.val()); -// var spent = parseFloat($('#spent-' + id).data('value')); -// -// // update small display: -// if (value > 0) { -// // show the input: -// $('#budget-info-' + id + ' span').show(); -// $('#budget-info-' + id + ' input').show(); -// -// // update the text: -// $('#budget-description-' + id).text('Budgeted: '); -// } else { -// // hide the input: -// $('#budget-info-' + id + ' span').hide(); -// $('#budget-info-' + id + ' input').hide(); -// -// // update the text: -// $('#budget-description-' + id).html('No budget'); -// } -// -// // update the range display text: -// $('#budget-range-display-' + id).text('\u20AC ' + value.toFixed(2)); -// -// // send a post to Firefly to update the amount: -// $.post('budgets/amount/' + id, {amount: value, _token: token}).success(function (data) { -// // update the link if relevant: -// $('#budget-link-' + id).attr('href', 'budgets/show/' + id + '/' + data.repetition); -// }); -// if (input.attr('type') === 'number') { -// // update the range-input: -// $('#budget-range-' + id).val(value); -// } else { -// // update the number-input: -// $('#budget-info-' + id + ' input').val(value); -// } -// -// // update or hide the bar, whichever is necessary. -// updateTotal(); -// return value; -//} -// -//function updateTotal() { -// "use strict"; -// var sum = 0; -// $('input[type="range"]').each(function (i, v) { -// // get some values: -// sum += parseInt($(v).val()); -// }); -// -// /** -// * Update total sum: -// */ -// var totalAmount = parseInt($('#totalAmount').data('value')); -// var pct; -// if (sum <= totalAmount) { -// pct = sum / totalAmount * 100; -// $('#progress-bar-default').css('width', pct + '%'); -// $('#progress-bar-warning').css('width', '0'); -// $('#progress-bar-danger').css('width', '0'); -// $('#budgetedAmount').text('\u20AC ' + sum.toFixed(2)).addClass('text-success').removeClass('text-danger'); -// } else { -// // we gaan er X overheen, -// -// pct = totalAmount / sum * 100; -// var danger = 100 - pct; -// var err = 100 - danger; -// $('#progress-bar-default').css('width', 0); -// $('#progress-bar-warning').css('width', err + '%'); -// $('#progress-bar-danger').css('width', danger + '%'); -// $('#budgetedAmount').text('\u20AC ' + sum.toFixed(2)).addClass('text-danger').removeClass('text-success'); -// } -// -//} -// -function updateIncome(e) { +function updateIncome() { "use strict"; $('#defaultModal').empty().load('budgets/income', function () { $('#defaultModal').modal('show'); @@ -200,51 +115,3 @@ function updateIncome(e) { return false; } -// -//function updateRanges() { -// "use strict"; -// -// -// var sum = 0; -// $('input[type="range"]').each(function (i, v) { -// // get some values: -// var input = $(v); -// var id = input.data('id'); -// var value = parseInt(input.val()); -// -// // calculate sum: -// sum += value; -// -// // update small display: -// $('#budget-range-display-' + id).text('\u20AC ' + value.toFixed(2)); -// -// // send a post to Firefly to update the amount: -// $.post('budgets/amount/' + id, {amount: value, _token: token}); -// -// }); -// -// /** -// * Update total sum: -// */ -// var totalAmount = parseInt($('#totalAmount').data('value')); -// var pct; -// if (sum <= totalAmount) { -// pct = sum / totalAmount * 100; -// $('#progress-bar-default').css('width', pct + '%'); -// $('#progress-bar-warning').css('width', '0'); -// $('#progress-bar-danger').css('width', '0'); -// $('#budgetedAmount').text('\u20AC ' + sum.toFixed(2)).addClass('text-success').removeClass('text-danger'); -// } else { -// // we gaan er X overheen, -// -// pct = totalAmount / sum * 100; -// var danger = 100 - pct; -// var err = 100 - danger; -// $('#progress-bar-default').css('width', 0); -// $('#progress-bar-warning').css('width', err + '%'); -// $('#progress-bar-danger').css('width', danger + '%'); -// $('#budgetedAmount').text('\u20AC ' + sum.toFixed(2)).addClass('text-danger').removeClass('text-success'); -// } -// -// -//} \ No newline at end of file diff --git a/resources/twig/index.twig b/resources/twig/index.twig index 255bcee62e..5328ae6f18 100644 --- a/resources/twig/index.twig +++ b/resources/twig/index.twig @@ -254,4 +254,4 @@ {% endblock %} {% block styles %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/tests/controllers/AccountControllerTest.php b/tests/controllers/AccountControllerTest.php index c242a00a62..8e1d1b9b64 100644 --- a/tests/controllers/AccountControllerTest.php +++ b/tests/controllers/AccountControllerTest.php @@ -81,6 +81,7 @@ class AccountControllerTest extends TestCase Amount::shouldReceive('getDefaultCurrency')->andReturn($currency); Amount::shouldReceive('getAllCurrencies')->andReturn([$currency]); Amount::shouldReceive('getCurrencyCode')->andReturn('X'); + Amount::shouldReceive('getCurrencySymbol')->andReturn('X'); $lastActivity = FactoryMuffin::create('FireflyIII\Models\Preference'); $lastActivity->data = microtime(); Preferences::shouldReceive('lastActivity')->andReturn($lastActivity); @@ -152,6 +153,7 @@ class AccountControllerTest extends TestCase Amount::shouldReceive('getDefaultCurrency')->andReturn($currency); Amount::shouldReceive('getAllCurrencies')->andReturn([$currency]); Amount::shouldReceive('getCurrencyCode')->andReturn('X'); + Amount::shouldReceive('getCurrencySymbol')->andReturn('X'); // get edit page: $this->call('GET', '/accounts/edit/' . $this->account->id); @@ -182,6 +184,7 @@ class AccountControllerTest extends TestCase Amount::shouldReceive('format')->andReturn(''); Amount::shouldReceive('getCurrencyCode')->andReturn('A'); + Amount::shouldReceive('getCurrencySymbol')->andReturn('X'); // put stuff in session: @@ -204,6 +207,7 @@ class AccountControllerTest extends TestCase // mock! Amount::shouldReceive('getCurrencyCode')->andReturn('A'); + Amount::shouldReceive('getCurrencySymbol')->andReturn('X'); $repository = $this->mock('FireflyIII\Repositories\Account\AccountRepositoryInterface'); $repository->shouldReceive('getJournals')->andReturn(new LengthAwarePaginator([], 0, 10)); diff --git a/tests/controllers/BillControllerTest.php b/tests/controllers/BillControllerTest.php index 08de5fec09..3fc9e690b2 100644 --- a/tests/controllers/BillControllerTest.php +++ b/tests/controllers/BillControllerTest.php @@ -52,6 +52,7 @@ class BillControllerTest extends TestCase Amount::shouldReceive('getDefaultCurrency')->andReturn($currency); Amount::shouldReceive('getAllCurrencies')->andReturn([$currency]); Amount::shouldReceive('getCurrencyCode')->andReturn('X'); + Amount::shouldReceive('getCurrencySymbol')->andReturn('X'); $this->call('GET', '/bills/create'); $this->assertViewHas('subTitle', 'Create new bill'); @@ -101,6 +102,7 @@ class BillControllerTest extends TestCase Amount::shouldReceive('getDefaultCurrency')->andReturn($currency); Amount::shouldReceive('getAllCurrencies')->andReturn([$currency]); Amount::shouldReceive('getCurrencyCode')->andReturn('X'); + Amount::shouldReceive('getCurrencySymbol')->andReturn('X'); $this->call('GET', '/bills/edit/' . $bill->id); $this->assertViewHas('subTitle', 'Edit bill "' . e($bill->name) . '"'); @@ -120,6 +122,7 @@ class BillControllerTest extends TestCase Amount::shouldReceive('format')->andReturn('XX'); Amount::shouldReceive('getCurrencyCode')->andReturn('X'); + Amount::shouldReceive('getCurrencySymbol')->andReturn('X'); $repository = $this->mock('FireflyIII\Repositories\Bill\BillRepositoryInterface'); $repository->shouldReceive('getBills')->once()->andReturn($collection); @@ -190,6 +193,7 @@ class BillControllerTest extends TestCase Amount::shouldReceive('format')->andReturn('XX'); Amount::shouldReceive('formatJournal')->andReturn('XX'); Amount::shouldReceive('getCurrencyCode')->andReturn('XX'); + Amount::shouldReceive('getCurrencySymbol')->andReturn('X'); $this->call('GET', '/bills/show/' . $bill->id); diff --git a/tests/controllers/BudgetControllerTest.php b/tests/controllers/BudgetControllerTest.php index 1446f1220a..b74bfe6a60 100644 --- a/tests/controllers/BudgetControllerTest.php +++ b/tests/controllers/BudgetControllerTest.php @@ -156,6 +156,7 @@ class BudgetControllerTest extends TestCase Amount::shouldReceive('getCurrencySymbol')->andReturn('x'); Amount::shouldReceive('format')->andReturn('x'); Amount::shouldReceive('getCurrencyCode')->andReturn('X'); + Amount::shouldReceive('getCurrencySymbol')->andReturn('X'); Amount::shouldReceive('getDefaultCurrency')->andReturn($currency); $this->call('GET', '/budgets'); @@ -221,6 +222,7 @@ class BudgetControllerTest extends TestCase $paginator = new LengthAwarePaginator(new Collection, 0, 20, 1); Amount::shouldReceive('getCurrencyCode')->andReturn('x'); + Amount::shouldReceive('getCurrencySymbol')->andReturn('X'); Amount::shouldReceive('format')->andReturn('x'); $repository->shouldReceive('getJournals')->andReturn($paginator); $repository->shouldReceive('getBudgetLimits')->andReturn(new Collection); @@ -247,6 +249,7 @@ class BudgetControllerTest extends TestCase $this->be($otherBudget->user); Amount::shouldReceive('getCurrencyCode')->andReturn('x'); + Amount::shouldReceive('getCurrencySymbol')->andReturn('X'); Amount::shouldReceive('format')->andReturn('x'); $repository->shouldReceive('getJournals')->andReturn(new Collection); $repository->shouldReceive('getBudgetLimits')->andReturn(new Collection); @@ -271,6 +274,7 @@ class BudgetControllerTest extends TestCase $paginator = new LengthAwarePaginator(new Collection, 0, 20, 1); Amount::shouldReceive('getCurrencyCode')->andReturn('x'); + Amount::shouldReceive('getCurrencySymbol')->andReturn('X'); Amount::shouldReceive('format')->andReturn('x'); $repository->shouldReceive('getJournals')->andReturn($paginator); $repository->shouldReceive('getBudgetLimits')->andReturn(new Collection); @@ -412,6 +416,7 @@ class BudgetControllerTest extends TestCase Amount::shouldReceive('format')->andReturn('xx'); Amount::shouldReceive('getCurrencyCode')->andReturn('X'); Amount::shouldReceive('getCurrencySymbol')->andReturn('X'); + Amount::shouldReceive('getCurrencySymbol')->andReturn('X'); $lastActivity = FactoryMuffin::create('FireflyIII\Models\Preference'); $lastActivity->data = microtime(); Preferences::shouldReceive('lastActivity')->andReturn($lastActivity); diff --git a/tests/controllers/CategoryControllerTest.php b/tests/controllers/CategoryControllerTest.php index 50644b4252..6fa7f76b00 100644 --- a/tests/controllers/CategoryControllerTest.php +++ b/tests/controllers/CategoryControllerTest.php @@ -107,6 +107,7 @@ class CategoryControllerTest extends TestCase $collection->push($category); Amount::shouldReceive('getCurrencyCode')->andReturn('xx'); + Amount::shouldReceive('getCurrencySymbol')->andReturn('X'); $repository = $this->mock('FireflyIII\Repositories\Category\CategoryRepositoryInterface'); $repository->shouldReceive('getCategories')->andReturn($collection); @@ -129,6 +130,7 @@ class CategoryControllerTest extends TestCase Amount::shouldReceive('format')->andReturn('xx'); Amount::shouldReceive('getCurrencyCode')->andReturn('xx'); + Amount::shouldReceive('getCurrencySymbol')->andReturn('X'); $repository = $this->mock('FireflyIII\Repositories\Category\CategoryRepositoryInterface'); @@ -159,6 +161,7 @@ class CategoryControllerTest extends TestCase Amount::shouldReceive('format')->andReturn('xx'); Amount::shouldReceive('getCurrencyCode')->andReturn('xx'); + Amount::shouldReceive('getCurrencySymbol')->andReturn('X'); Amount::shouldReceive('formatJournal')->andReturn('xx'); $this->call('GET', '/categories/show/' . $category->id); diff --git a/tests/controllers/HomeControllerTest.php b/tests/controllers/HomeControllerTest.php index deb442fbd0..f4595b017e 100644 --- a/tests/controllers/HomeControllerTest.php +++ b/tests/controllers/HomeControllerTest.php @@ -119,6 +119,7 @@ class HomeControllerTest extends TestCase Amount::shouldReceive('getCurrencyCode')->andReturn('EUR'); + Amount::shouldReceive('getCurrencySymbol')->andReturn('X'); Amount::shouldReceive('format')->andReturn('xxx'); Amount::shouldReceive('formatJournal')->with($journal)->andReturn('xxx'); diff --git a/tests/controllers/JsonControllerTest.php b/tests/controllers/JsonControllerTest.php index f585818721..51ab83c92c 100644 --- a/tests/controllers/JsonControllerTest.php +++ b/tests/controllers/JsonControllerTest.php @@ -61,6 +61,7 @@ class JsonControllerTest extends TestCase $accounts->shouldReceive('getTransfersInRange')->andReturn(new Collection); Amount::shouldReceive('format')->andReturn('xx'); Amount::shouldReceive('getCurrencyCode')->andReturn('X'); + Amount::shouldReceive('getCurrencySymbol')->andReturn('X'); Steam::shouldReceive('balance')->andReturn(0); @@ -92,6 +93,7 @@ class JsonControllerTest extends TestCase $accounts->shouldReceive('getCreditCards')->andReturn($ccs); Amount::shouldReceive('format')->andReturn('xx'); Amount::shouldReceive('getCurrencyCode')->andReturn('X'); + Amount::shouldReceive('getCurrencySymbol')->andReturn('X'); Steam::shouldReceive('balance')->andReturn(-1); $this->call('GET', '/json/box/bills-unpaid'); @@ -110,6 +112,7 @@ class JsonControllerTest extends TestCase $repository->shouldReceive('incomeInPeriodCorrected')->andReturn(new Collection); Amount::shouldReceive('format')->andReturn('xx'); Amount::shouldReceive('getCurrencyCode')->andReturn('X'); + Amount::shouldReceive('getCurrencySymbol')->andReturn('X'); $this->call('GET', '/json/box/in'); $this->assertResponseOk(); @@ -127,6 +130,7 @@ class JsonControllerTest extends TestCase $repository->shouldReceive('expenseInPeriodCorrected')->andReturn(new Collection); Amount::shouldReceive('format')->andReturn('xx'); Amount::shouldReceive('getCurrencyCode')->andReturn('X'); + Amount::shouldReceive('getCurrencySymbol')->andReturn('X'); $this->call('GET', '/json/box/out'); $this->assertResponseOk(); diff --git a/tests/controllers/NewUserControllerTest.php b/tests/controllers/NewUserControllerTest.php index e27ddb0d72..3016148bd8 100644 --- a/tests/controllers/NewUserControllerTest.php +++ b/tests/controllers/NewUserControllerTest.php @@ -47,6 +47,8 @@ class NewUserControllerTest extends TestCase $lastActivity = FactoryMuffin::create('FireflyIII\Models\Preference'); $lastActivity->data = microtime(); Preferences::shouldReceive('lastActivity')->andReturn($lastActivity); + Amount::shouldReceive('getCurrencyCode')->andReturn('X'); + Amount::shouldReceive('getCurrencySymbol')->andReturn('X'); $this->call('GET', '/new-user'); $this->assertResponseStatus(200); diff --git a/tests/controllers/PiggyBankControllerTest.php b/tests/controllers/PiggyBankControllerTest.php index 95a2ecc80d..884943a5aa 100644 --- a/tests/controllers/PiggyBankControllerTest.php +++ b/tests/controllers/PiggyBankControllerTest.php @@ -58,6 +58,7 @@ class PiggyBankControllerTest extends TestCase Amount::shouldReceive('format')->andReturn('XXxx'); Amount::shouldReceive('getCurrencyCode')->andReturn('X'); Amount::shouldReceive('getCurrencySymbol')->andReturn('X'); + Amount::shouldReceive('getCurrencySymbol')->andReturn('X'); $this->call('GET', '/piggy-banks/add/' . $piggyBank->id); $this->assertResponseOk(); @@ -208,6 +209,7 @@ class PiggyBankControllerTest extends TestCase $accounts->shouldReceive('leftOnAccount')->andReturn(12); Amount::shouldReceive('format')->andReturn('123'); Amount::shouldReceive('getCurrencyCode')->andReturn('X'); + Amount::shouldReceive('getCurrencySymbol')->andReturn('X'); $this->call('GET', '/piggy-banks'); @@ -254,6 +256,7 @@ class PiggyBankControllerTest extends TestCase Amount::shouldReceive('format')->andReturn('something'); Amount::shouldReceive('getCurrencyCode')->andReturn('X'); + Amount::shouldReceive('getCurrencySymbol')->andReturn('X'); $this->call('POST', '/piggy-banks/add/' . $piggyBank->id, ['_token' => 'replaceMe']); $this->assertResponseStatus(302); @@ -273,6 +276,7 @@ class PiggyBankControllerTest extends TestCase Amount::shouldReceive('format')->andReturn('something'); Amount::shouldReceive('getCurrencyCode')->andReturn('X'); + Amount::shouldReceive('getCurrencySymbol')->andReturn('X'); $this->call('POST', '/piggy-banks/add/' . $piggyBank->id, ['_token' => 'replaceMe', 'amount' => '10000']); $this->assertResponseStatus(302); diff --git a/tests/controllers/PreferencesControllerTest.php b/tests/controllers/PreferencesControllerTest.php index c92e77fea5..7631aa2ea8 100644 --- a/tests/controllers/PreferencesControllerTest.php +++ b/tests/controllers/PreferencesControllerTest.php @@ -59,6 +59,7 @@ class PreferencesControllerTest extends TestCase Preferences::shouldReceive('get')->withArgs(['currencyPreference', 'EUR'])->andReturn($pref); Amount::shouldReceive('format')->andReturn('xx'); Amount::shouldReceive('getCurrencyCode')->andReturn('X'); + Amount::shouldReceive('getCurrencySymbol')->andReturn('X'); Amount::shouldReceive('getAllCurrencies')->andReturn(new Collection); Amount::shouldReceive('getDefaultCurrency')->andReturn($currency); diff --git a/tests/controllers/TransactionControllerTest.php b/tests/controllers/TransactionControllerTest.php index c0a0787734..814457fe6b 100644 --- a/tests/controllers/TransactionControllerTest.php +++ b/tests/controllers/TransactionControllerTest.php @@ -339,6 +339,7 @@ class TransactionControllerTest extends TestCase Amount::shouldReceive('getDefaultCurrency')->andReturn($currency); Amount::shouldReceive('getAllCurrencies')->andReturn([$currency]); Amount::shouldReceive('getCurrencyCode')->andReturn('X'); + Amount::shouldReceive('getCurrencySymbol')->andReturn('X'); Amount::shouldReceive('formatTransaction')->andReturn('X'); Amount::shouldReceive('format')->andReturn('X');