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

Speed up category test.

Browse Source
This commit is contained in:
James Cole
2018-07-27 06:02:34 +02:00
parent 6f64c19c32
commit 26fa2b0b74
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/Http/Controllers/Category/ShowController.php
View File

@@ -36,7 +36,7 @@ use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use FireflyIII\Support\CacheProperties; use FireflyIII\Support\CacheProperties;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Log;
/** /**
* *
@@ -88,10 +88,11 @@ class ShowController extends Controller
*/ */
public function show(Request $request, Category $category, Carbon $start = null, Carbon $end = null) public function show(Request $request, Category $category, Carbon $start = null, Carbon $end = null)
{ {
Log::debug('Now in show()');
/** @var Carbon $start */ /** @var Carbon $start */
$start = $start ?? session('start'); $start = $start ?? session('start', Carbon::create()->startOfMonth());
/** @var Carbon $end */ /** @var Carbon $end */
$end = $end ?? session('end'); $end = $end ?? session('end', Carbon::create()->startOfMonth());
$subTitleIcon = 'fa-bar-chart'; $subTitleIcon = 'fa-bar-chart';
$moment = ''; $moment = '';
$page = (int)$request->get('page'); $page = (int)$request->get('page');
@@ -112,6 +113,8 @@ class ShowController extends Controller
$transactions = $collector->getPaginatedJournals(); $transactions = $collector->getPaginatedJournals();
$transactions->setPath($path); $transactions->setPath($path);
Log::debug('End of show()');
return view('categories.show', compact('category', 'transactions', 'moment', 'periods', 'subTitle', 'subTitleIcon', 'start', 'end')); return view('categories.show', compact('category', 'transactions', 'moment', 'periods', 'subTitle', 'subTitleIcon', 'start', 'end'));
} }

13
tests/Feature/Controllers/Category/ShowControllerTest.php
View File

@@ -63,7 +63,7 @@ class ShowControllerTest extends TestCase
*/ */
public function testShow(string $range): void public function testShow(string $range): void
{ {
Log::debug('Test show()'); Log::debug(sprintf('Test show(%s)', $range));
$transaction = factory(Transaction::class)->make(); $transaction = factory(Transaction::class)->make();
$categoryRepos = $this->mock(CategoryRepositoryInterface::class); $categoryRepos = $this->mock(CategoryRepositoryInterface::class);
$accountRepos = $this->mock(AccountRepositoryInterface::class); $accountRepos = $this->mock(AccountRepositoryInterface::class);
@@ -113,7 +113,7 @@ class ShowControllerTest extends TestCase
*/ */
public function testShowAll(string $range): void public function testShowAll(string $range): void
{ {
Log::debug('Test showAll()'); Log::debug(sprintf('Test showAll(%s)', $range));
// mock stuff // mock stuff
$transaction = factory(Transaction::class)->make(); $transaction = factory(Transaction::class)->make();
$journalRepos = $this->mock(JournalRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class);
@@ -151,7 +151,7 @@ class ShowControllerTest extends TestCase
*/ */
public function testShowByDate(string $range): void public function testShowByDate(string $range): void
{ {
Log::debug('Test showbydate()'); Log::debug(sprintf('Test testShowByDate(%s)', $range));
// mock stuff // mock stuff
$transaction = factory(Transaction::class)->make(); $transaction = factory(Transaction::class)->make();
$repository = $this->mock(CategoryRepositoryInterface::class); $repository = $this->mock(CategoryRepositoryInterface::class);
@@ -199,9 +199,12 @@ class ShowControllerTest extends TestCase
*/ */
public function testShowEmpty(string $range): void public function testShowEmpty(string $range): void
{ {
Log::debug('Test showempty()'); $latestJournal = $this->user()->transactionJournals()
->orderBy('date','DESC')->first();
Log::debug(sprintf('Test testShowEmpty(%s)', $range));
$journalRepos = $this->mock(JournalRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class);
$journalRepos->shouldReceive('firstNull')->twice()->andReturn(TransactionJournal::first()); $journalRepos->shouldReceive('firstNull')->twice()->andReturn($latestJournal);
// mock stuff // mock stuff
$repository = $this->mock(CategoryRepositoryInterface::class); $repository = $this->mock(CategoryRepositoryInterface::class);