kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-30 02:26:58 +00:00
Code Issues Projects Releases Wiki Activity

Cleanup and fix tests.

Browse Source
This commit is contained in:
James Cole
2016-03-02 13:13:33 +01:00
parent b04d68d087
commit 3ef84dc1fc
4 changed files with 51 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/Helpers/Collection/Account.php
View File

@@ -16,11 +16,19 @@ class Account
/** @var Collection */ /** @var Collection */
protected $accounts; protected $accounts;
/** @var string */ /** @var string */
protected $difference; protected $difference = '';
/** @var string */ /** @var string */
protected $end; protected $end = '';
/** @var string */ /** @var string */
protected $start; protected $start = '';
/**
* Account constructor.
*/
public function __construct()
{
$this->accounts = new Collection;
}
/** /**
* @return Collection * @return Collection

2
app/Helpers/Collection/Balance.php
View File

@@ -41,7 +41,7 @@ class Balance
*/ */
public function getBalanceHeader(): BalanceHeader public function getBalanceHeader(): BalanceHeader
{ {
return $this->balanceHeader; return $this->balanceHeader ?? new BalanceHeader;
} }
/** /**

8
app/Http/Controllers/ReportController.php
View File

@@ -2,6 +2,9 @@
use Carbon\Carbon; use Carbon\Carbon;
use FireflyIII\Exceptions\FireflyException; use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Helpers\Report\AccountReportHelperInterface;
use FireflyIII\Helpers\Report\BalanceReportHelperInterface;
use FireflyIII\Helpers\Report\BudgetReportHelperInterface;
use FireflyIII\Helpers\Report\ReportHelperInterface; use FireflyIII\Helpers\Report\ReportHelperInterface;
use FireflyIII\Models\Account; use FireflyIII\Models\Account;
use FireflyIII\Repositories\Account\AccountRepositoryInterface as ARI; use FireflyIII\Repositories\Account\AccountRepositoryInterface as ARI;
@@ -19,9 +22,12 @@ use View;
class ReportController extends Controller class ReportController extends Controller
{ {
/** @var AccountReportHelperInterface */
protected $accountHelper; protected $accountHelper;
/** @var BalanceReportHelperInterface */
protected $balanceHelper; protected $balanceHelper;
/** @var BudgetReportHelperInterface */
protected $budgetHelper; protected $budgetHelper;
/** @var ReportHelperInterface */ /** @var ReportHelperInterface */
protected $helper; protected $helper;

52
tests/acceptance/Controllers/ReportControllerTest.php
View File

@@ -11,6 +11,9 @@ use FireflyIII\Helpers\Collection\Bill as BillCollection;
use FireflyIII\Helpers\Collection\Category as CategoryCollection; use FireflyIII\Helpers\Collection\Category as CategoryCollection;
use FireflyIII\Helpers\Collection\Expense; use FireflyIII\Helpers\Collection\Expense;
use FireflyIII\Helpers\Collection\Income; use FireflyIII\Helpers\Collection\Income;
use FireflyIII\Helpers\Collection\Account as AccountCollection;
use FireflyIII\Helpers\Collection\Budget as BudgetCollection;
use FireflyIII\Helpers\Collection\Balance;
/** /**
* Generated by PHPUnit_SkeletonGenerator on 2016-01-19 at 15:39:28. * Generated by PHPUnit_SkeletonGenerator on 2016-01-19 at 15:39:28.
@@ -44,34 +47,28 @@ class ReportControllerTest extends TestCase
public function testReportDefaultMonth($range) public function testReportDefaultMonth($range)
{ {
// mock some stuff. // mock some stuff.
$repository = $this->mock('FireflyIII\Helpers\Report\ReportHelperInterface'); $accountHelper = $this->mock('FireflyIII\Helpers\Report\AccountReportHelperInterface');
$repository->shouldReceive('getCategoryReport')->once()->andReturn(new CategoryCollection); $budgetHelper = $this->mock('FireflyIII\Helpers\Report\BudgetReportHelperInterface');
$repository->shouldReceive('getIncomeReport')->once()->andReturn(new Income); $balanceHelper = $this->mock('FireflyIII\Helpers\Report\BalanceReportHelperInterface');
$repository->shouldReceive('getExpenseReport')->once()->andReturn(new Expense); $defaultHelper = $this->mock('FireflyIII\Helpers\Report\ReportHelperInterface');
$repository->shouldReceive('getBillReport')->once()->andReturn(new BillCollection);
$accountHelper->shouldReceive('getAccountReport')->once()->andReturn(new AccountCollection);
$defaultHelper->shouldReceive('getIncomeReport')->once()->andReturn(new Income);
$defaultHelper->shouldReceive('getExpenseReport')->once()->andReturn(new Expense);
$budgetHelper->shouldReceive('getBudgetReport')->once()->andReturn(new BudgetCollection);
$defaultHelper->shouldReceive('getCategoryReport')->once()->andReturn(new CategoryCollection);
$balanceHelper->shouldReceive('getBalanceReport')->once()->andReturn(new Balance);
$defaultHelper->shouldReceive('getBillReport')->once()->andReturn(new BillCollection);
$defaultHelper->shouldReceive('tagReport')->once()->andReturn([]);
$this->be($this->user()); $this->be($this->user());
$this->changeDateRange($this->user(), $range); $this->changeDateRange($this->user(), $range);
$this->call('GET', '/reports/report/default/20160101/20160131/1,2'); $this->call('GET', '/reports/report/default/20160101/20160131/1,2');
$this->assertResponseStatus(200); $this->assertResponseStatus(200);
} }
/**
* @covers FireflyIII\Http\Controllers\ReportController::report
* @covers FireflyIII\Http\Controllers\ReportController::defaultYear
* @dataProvider dateRangeProvider
*
* @param $range
*/
public function testReportDefaultYear($range)
{
$this->be($this->user());
$this->changeDateRange($this->user(), $range);
$this->call('GET', '/reports/report/default/20160101/20161231/1,2');
$this->assertResponseStatus(200);
}
/** /**
* @covers FireflyIII\Http\Controllers\ReportController::report * @covers FireflyIII\Http\Controllers\ReportController::report
* @covers FireflyIII\Http\Controllers\ReportController::defaultMultiYear * @covers FireflyIII\Http\Controllers\ReportController::defaultMultiYear
@@ -86,4 +83,19 @@ class ReportControllerTest extends TestCase
$this->call('GET', '/reports/report/default/20160101/20171231/1,2'); $this->call('GET', '/reports/report/default/20160101/20171231/1,2');
$this->assertResponseStatus(200); $this->assertResponseStatus(200);
} }
/**
* @covers FireflyIII\Http\Controllers\ReportController::report
* @covers FireflyIII\Http\Controllers\ReportController::defaultYear
* @dataProvider dateRangeProvider
*
* @param $range
*/
public function testReportDefaultYear($range)
{
$this->be($this->user());
$this->changeDateRange($this->user(), $range);
$this->call('GET', '/reports/report/default/20160101/20161231/1,2');
$this->assertResponseStatus(200);
}
} }