IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix some tests. Won't fix all.

Browse Source
This commit is contained in:
James Cole 2016-04-06 19:44:42 +02:00
parent 250b2c2f53
commit 768d3bb3e8
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Controllers/Chart/PiggyBankController.php
View File

@ -50,8 +50,7 @@ class PiggyBankController extends Controller
return Response::json($cache->get()); return Response::json($cache->get());
} }
/** @var Collection $set */ $set = $repository->getEventSummarySet($piggyBank);
$set = new Collection($repository->getEventSummarySet($piggyBank));
$data = $this->generator->history($set); $data = $this->generator->history($set);
$cache->store($data); $cache->store($data);

6
app/Repositories/PiggyBank/PiggyBankRepository.php
View File

@ -52,6 +52,7 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface
public function destroy(PiggyBank $piggyBank): bool public function destroy(PiggyBank $piggyBank): bool
{ {
$piggyBank->delete(); $piggyBank->delete();
return true; return true;
} }
@ -62,7 +63,9 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface
*/ */
public function getEventSummarySet(PiggyBank $piggyBank): Collection public function getEventSummarySet(PiggyBank $piggyBank): Collection
{ {
return DB::table('piggy_bank_events')->where('piggy_bank_id', $piggyBank->id)->groupBy('date')->get(['date', DB::raw('SUM(`amount`) AS `sum`')]); $var = DB::table('piggy_bank_events')->where('piggy_bank_id', $piggyBank->id)->groupBy('date')->get(['date', DB::raw('SUM(`amount`) AS `sum`')]);
return new Collection($var);
} }
/** /**
@ -130,6 +133,7 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface
$piggyBank->order = $order; $piggyBank->order = $order;
$piggyBank->save(); $piggyBank->save();
} }
return true; return true;
} }

2
tests/acceptance/Controllers/CsvControllerTest.php
View File

@ -36,7 +36,7 @@ class CsvControllerTest extends TestCase
$data->shouldReceive('getRoles')->once()->andReturn([]); $data->shouldReceive('getRoles')->once()->andReturn([]);
$data->shouldReceive('getMap')->once()->andReturn([]); $data->shouldReceive('getMap')->once()->andReturn([]);
$data->shouldReceive('hasHeaders')->once()->andReturn([]); $data->shouldReceive('hasHeaders')->once()->andReturn(false);
$this->call('GET', '/csv/column_roles'); $this->call('GET', '/csv/column_roles');