There is no help for this route.
'; diff --git a/app/Http/Controllers/JsonController.php b/app/Http/Controllers/JsonController.php index 322e34c97a..fb69b046d9 100644 --- a/app/Http/Controllers/JsonController.php +++ b/app/Http/Controllers/JsonController.php @@ -239,6 +239,11 @@ class JsonController extends Controller return Response::json(['value' => $pref->data]); } + /** + * @param $what + * + * @return \Symfony\Component\HttpFoundation\Response + */ public function transactionJournals($what) { $descriptions = []; diff --git a/app/Repositories/Account/AccountRepository.php b/app/Repositories/Account/AccountRepository.php index 50807a32b9..46e837d9e9 100644 --- a/app/Repositories/Account/AccountRepository.php +++ b/app/Repositories/Account/AccountRepository.php @@ -509,7 +509,6 @@ class AccountRepository implements AccountRepositoryInterface protected function updateMetadata(Account $account, array $data) { $validFields = ['accountRole', 'ccMonthlyPaymentDate', 'ccType']; - $updated = false; foreach ($validFields as $field) { $entry = $account->accountMeta()->where('name', $field)->first(); diff --git a/app/Repositories/Currency/CurrencyRepository.php b/app/Repositories/Currency/CurrencyRepository.php index bffdc88c94..d7991b6098 100644 --- a/app/Repositories/Currency/CurrencyRepository.php +++ b/app/Repositories/Currency/CurrencyRepository.php @@ -81,4 +81,4 @@ class CurrencyRepository implements CurrencyRepositoryInterface return $currency; } -} \ No newline at end of file +} diff --git a/app/Repositories/Currency/CurrencyRepositoryInterface.php b/app/Repositories/Currency/CurrencyRepositoryInterface.php index cfb72467ba..2514d08aba 100644 --- a/app/Repositories/Currency/CurrencyRepositoryInterface.php +++ b/app/Repositories/Currency/CurrencyRepositoryInterface.php @@ -49,4 +49,4 @@ interface CurrencyRepositoryInterface */ public function update(TransactionCurrency $currency, array $data); -} \ No newline at end of file +} diff --git a/database/migrations/2014_12_13_190730_changes_for_v321.php b/database/migrations/2014_12_13_190730_changes_for_v321.php index b381e774ab..5a0524d322 100644 --- a/database/migrations/2014_12_13_190730_changes_for_v321.php +++ b/database/migrations/2014_12_13_190730_changes_for_v321.php @@ -426,7 +426,6 @@ class ChangesForV321 extends Migration public function moveComponentIdToBudgetId() { - //Log::debug('Now in moveComponentIdToBudgetId()'); BudgetLimit::get()->each( function (BudgetLimit $bl) { Log::debug('Now at budgetLimit #' . $bl->id . ' with component_id: ' . $bl->component_id); @@ -447,7 +446,6 @@ class ChangesForV321 extends Migration } } ); - //Log::debug('Done with moveComponentIdToBudgetId()'); } diff --git a/resources/views/form/help.blade.php b/resources/views/form/help.blade.php index ce06cb2e49..9b6375c241 100644 --- a/resources/views/form/help.blade.php +++ b/resources/views/form/help.blade.php @@ -1,3 +1,3 @@ @if(isset($options['helpText'])){{$options['helpText']}}
-@endif \ No newline at end of file +@endif diff --git a/tests/controllers/GoogleChartControllerTest.php b/tests/controllers/GoogleChartControllerTest.php index 612b2d71f5..23ce5ccc8e 100644 --- a/tests/controllers/GoogleChartControllerTest.php +++ b/tests/controllers/GoogleChartControllerTest.php @@ -292,12 +292,47 @@ class GoogleChartControllerTest extends TestCase public function testYearInExp() { - $this->markTestIncomplete(); + $user = FactoryMuffin::create('FireflyIII\User'); + $preference = FactoryMuffin::create('FireflyIII\Models\Preference'); + $journal1 = FactoryMuffin::create('FireflyIII\Models\TransactionJournal'); + $journal2 = FactoryMuffin::create('FireflyIII\Models\TransactionJournal'); + $journals = new Collection([$journal1, $journal2]); + $this->be($user); + + + // mock! + $repository = $this->mock('FireflyIII\Helpers\Report\ReportQueryInterface'); + + // expect! + $repository->shouldReceive('incomeByPeriod')->andReturn($journals); + $repository->shouldReceive('journalsByExpenseAccount')->andReturn($journals); + Preferences::shouldReceive('get')->withArgs(['showSharedReports',false])->once()->andReturn($preference); + + + $this->call('GET', '/chart/reports/income-expenses/2015'); + $this->assertResponseOk(); } public function testYearInExpSum() { - $this->markTestIncomplete(); + $user = FactoryMuffin::create('FireflyIII\User'); + $preference = FactoryMuffin::create('FireflyIII\Models\Preference'); + $journal1 = FactoryMuffin::create('FireflyIII\Models\TransactionJournal'); + $journal2 = FactoryMuffin::create('FireflyIII\Models\TransactionJournal'); + $journals = new Collection([$journal1, $journal2]); + $this->be($user); + + + // mock! + $repository = $this->mock('FireflyIII\Helpers\Report\ReportQueryInterface'); + + // expect! + $repository->shouldReceive('incomeByPeriod')->andReturn($journals); + $repository->shouldReceive('journalsByExpenseAccount')->andReturn($journals); + Preferences::shouldReceive('get')->withArgs(['showSharedReports',false])->once()->andReturn($preference); + + + $this->call('GET', '/chart/reports/income-expenses-sum/2015'); } } \ No newline at end of file