gh-mirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-09 20:11:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Various code cleanup.

Browse Source
This commit is contained in:
James Cole
2017-03-29 21:20:54 +02:00
parent 569fec4610
commit 5920ccee04
11 changed files with 287 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/Feature/Controllers/Chart/CategoryReportControllerTest.php
View File

@@ -7,7 +7,7 @@
* See the LICENSE file for details.
*/
declare(strict_types = 1);
declare(strict_types=1);
namespace Tests\Feature\Controllers\Chart;
@@ -15,6 +15,7 @@ namespace Tests\Feature\Controllers\Chart;
use FireflyIII\Generator\Chart\Basic\GeneratorInterface;
use FireflyIII\Helpers\Chart\MetaPieChartInterface;
use FireflyIII\Helpers\Collector\JournalCollectorInterface;
use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionType;
use Illuminate\Support\Collection;
use Tests\TestCase;
@@ -120,8 +121,9 @@ class CategoryReportControllerTest extends TestCase
*/
public function testMainChart()
{
$generator = $this->mock(GeneratorInterface::class);
$collector = $this->mock(JournalCollectorInterface::class);
$generator = $this->mock(GeneratorInterface::class);
$collector = $this->mock(JournalCollectorInterface::class);
$transaction = factory(Transaction::class)->make();
$collector->shouldReceive('setAccounts')->andReturnSelf();
$collector->shouldReceive('setRange')->andReturnSelf();
@@ -130,7 +132,7 @@ class CategoryReportControllerTest extends TestCase
$collector->shouldReceive('disableFilter')->andReturnSelf();
$collector->shouldReceive('setCategories')->andReturnSelf();
$collector->shouldReceive('withOpposingAccount')->andReturnSelf();
$collector->shouldReceive('getJournals')->andReturn(new Collection);
$collector->shouldReceive('getJournals')->andReturn(new Collection([$transaction]));
$generator->shouldReceive('multiSet')->andReturn([])->once();
$this->be($this->user());

19
tests/Feature/Controllers/Chart/TagReportControllerTest.php
View File

@@ -7,7 +7,7 @@
* See the LICENSE file for details.
*/
declare(strict_types = 1);
declare(strict_types=1);
namespace Tests\Feature\Controllers\Chart;
@@ -15,6 +15,8 @@ namespace Tests\Feature\Controllers\Chart;
use FireflyIII\Generator\Chart\Basic\GeneratorInterface;
use FireflyIII\Helpers\Chart\MetaPieChartInterface;
use FireflyIII\Helpers\Collector\JournalCollectorInterface;
use FireflyIII\Models\Tag;
use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionType;
use Illuminate\Support\Collection;
use Tests\TestCase;
@@ -114,11 +116,18 @@ class TagReportControllerTest extends TestCase
/**
* @covers \FireflyIII\Http\Controllers\Chart\TagReportController::mainChart()
* @covers \FireflyIII\Http\Controllers\Chart\TagReportController::getExpenses
* @covers \FireflyIII\Http\Controllers\Chart\TagReportController::getIncome
* @covers \FireflyIII\Http\Controllers\Chart\TagReportController::groupByTag
*/
public function testMainChart()
{
$generator = $this->mock(GeneratorInterface::class);
$collector = $this->mock(JournalCollectorInterface::class);
$generator = $this->mock(GeneratorInterface::class);
$collector = $this->mock(JournalCollectorInterface::class);
$transaction = factory(Transaction::class)->make();
$tag = factory(Tag::class)->make();
$transaction->transactionJournal->tags()->save($tag);
$collector->shouldReceive('setAccounts')->andReturnSelf();
$collector->shouldReceive('setRange')->andReturnSelf();
@@ -127,7 +136,7 @@ class TagReportControllerTest extends TestCase
$collector->shouldReceive('disableFilter')->andReturnSelf();
$collector->shouldReceive('setTags')->andReturnSelf();
$collector->shouldReceive('withOpposingAccount')->andReturnSelf();
$collector->shouldReceive('getJournals')->andReturn(new Collection);
$collector->shouldReceive('getJournals')->andReturn(new Collection([$transaction]));
$generator->shouldReceive('multiSet')->andReturn([])->once();
$this->be($this->user());
@@ -157,7 +166,7 @@ class TagReportControllerTest extends TestCase
}
/**
* @covers \FireflyIII\Http\Controllers\Chart\TagReportController::tagIncome()
* @covers \FireflyIII\Http\Controllers\Chart\TagReportController::tagIncome
*/
public function testTagIncome()
{