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

Fix test coverage.

Browse Source
This commit is contained in:
James Cole
2018-12-09 20:54:11 +01:00
parent 97f6e68164
commit ae4612f134
46 changed files with 383 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/Support/Http/Controllers/RequestInformation.php
View File

@@ -222,7 +222,6 @@ trait RequestInformation
*/
protected function getTransactionDataFromJournal(TransactionJournal $journal): array // convert object
{
$repository = app(JournalRepositoryInterface::class);
// use collector to collect transactions.
$collector = app(TransactionCollectorInterface::class);
$collector->setUser(auth()->user());
@@ -231,7 +230,7 @@ trait RequestInformation
$collector->setJournals(new Collection([$journal]));
$set = $collector->getTransactions();
$transactions = [];
$transformer = new TransactionTransformer(new ParameterBag, $repository);
$transformer = new TransactionTransformer(new ParameterBag);
/** @var Transaction $transaction */
foreach ($set as $transaction) {
$res = [];
@@ -262,7 +261,7 @@ trait RequestInformation
protected function getValidTriggerList(TestRuleFormRequest $request): array // process input
{
$triggers = [];
$data = $request->get('rule_triggers');
$data = $request->get('triggers');
if (\is_array($data)) {
foreach ($data as $index => $triggerInfo) {
$triggers[] = [

10
app/Support/Http/Controllers/RuleManagement.php
View File

@@ -51,7 +51,8 @@ trait RuleManagement
'description' => (string)trans('firefly.default_rule_description'),
'trigger' => 'store-journal',
'strict' => true,
'rule_triggers' => [
'active' => true,
'triggers' => [
[
'name' => 'description_is',
'value' => (string)trans('firefly.default_rule_trigger_description'),
@@ -66,7 +67,7 @@ trait RuleManagement
],
],
'rule_actions' => [
'actions' => [
[
'name' => 'prepend_description',
'value' => (string)trans('firefly.default_rule_action_prepend'),
@@ -94,7 +95,7 @@ trait RuleManagement
{
$index = 0;
$triggers = [];
$oldInput = $request->old('rule_actions');
$oldInput = $request->old('actions');
if (\is_array($oldInput)) {
foreach ($oldInput as $oldAction) {
try {
@@ -127,7 +128,7 @@ trait RuleManagement
{
$index = 0;
$triggers = [];
$oldInput = $request->old('rule_triggers');
$oldInput = $request->old('triggers');
if (\is_array($oldInput)) {
foreach ($oldInput as $oldTrigger) {
try {
@@ -162,6 +163,7 @@ trait RuleManagement
$data = [
'title' => (string)trans('firefly.default_rule_group_name'),
'description' => (string)trans('firefly.default_rule_group_description'),
'active' => true,
];
$repository->store($data);