From 666e9897ea58e87233a9f9e4fec184a3feb7b713 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Thu, 5 Jul 2018 18:42:51 +0200
Subject: [PATCH] Fix unit test.

---
 .../V1/Controllers/BudgetLimitController.php  |  2 +-
 .../V1/Controllers/RecurrenceController.php   |  2 +-
 .../Triggers/ToAccountStartsTest.php          | 31 +++++++++++++------
 3 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/app/Api/V1/Controllers/BudgetLimitController.php b/app/Api/V1/Controllers/BudgetLimitController.php
index 62e172fd3e..c95e915086 100644
--- a/app/Api/V1/Controllers/BudgetLimitController.php
+++ b/app/Api/V1/Controllers/BudgetLimitController.php
@@ -115,7 +115,7 @@ class BudgetLimitController extends Controller
 
         $count        = $collection->count();
         $budgetLimits = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
-        $paginator = new LengthAwarePaginator($budgetLimits, $count, $pageSize, $this->parameters->get('page'));
+        $paginator    = new LengthAwarePaginator($budgetLimits, $count, $pageSize, $this->parameters->get('page'));
         $paginator->setPath(route('api.v1.budget_limits.index') . $this->buildParams());
 
         $manager->setSerializer(new JsonApiSerializer($baseUrl));
diff --git a/app/Api/V1/Controllers/RecurrenceController.php b/app/Api/V1/Controllers/RecurrenceController.php
index 5c23d377e3..c80b72d993 100644
--- a/app/Api/V1/Controllers/RecurrenceController.php
+++ b/app/Api/V1/Controllers/RecurrenceController.php
@@ -162,7 +162,7 @@ class RecurrenceController extends Controller
      */
     public function update(RecurrenceRequest $request, Recurrence $recurrence): JsonResponse
     {
-        $data = $request->getAll();
+        $data     = $request->getAll();
         $category = $this->repository->update($recurrence, $data);
         $manager  = new Manager();
         $baseUrl  = $request->getSchemeAndHttpHost() . '/api/v1';
diff --git a/tests/Unit/TransactionRules/Triggers/ToAccountStartsTest.php b/tests/Unit/TransactionRules/Triggers/ToAccountStartsTest.php
index fc24e98010..6e468b368d 100644
--- a/tests/Unit/TransactionRules/Triggers/ToAccountStartsTest.php
+++ b/tests/Unit/TransactionRules/Triggers/ToAccountStartsTest.php
@@ -24,6 +24,7 @@ namespace Tests\Unit\TransactionRules\Triggers;
 
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\TransactionRules\Triggers\ToAccountStarts;
+use Log;
 use Tests\TestCase;
 
 /**
@@ -36,14 +37,20 @@ class ToAccountStartsTest extends TestCase
      */
     public function testTriggered(): void
     {
-        $count = 0;
-        $account = null;
-        while ($count !== 0 && $account !== null) {
-            $journal     = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first();
+        Log::debug('Now in testTriggered');
+
+        $loopCount = 0;
+        $account   = null;
+        do {
+            Log::debug(sprintf('Count of loop: %d', $loopCount));
+            $journal     = $this->user()->transactionJournals()->inRandomOrder()->whereNull('deleted_at')->first();
             $count       = $journal->transactions()->where('amount', '>', 0)->count();
             $transaction = $journal->transactions()->where('amount', '>', 0)->first();
             $account     = $transaction->account;
-        }
+            Log::debug(sprintf('Journal with id #%d', $journal->id));
+            Log::debug(sprintf('Count of transactions is %d', $count));
+            Log::debug(sprintf('Account is null: %s', var_export(null === $account, true)));
+        } while ($loopCount < 30 && $count !== 2 && null !== $account);
 
 
         $trigger = ToAccountStarts::makeFromStrings(substr($account->name, 0, -3), false);
@@ -56,14 +63,18 @@ class ToAccountStartsTest extends TestCase
      */
     public function testTriggeredLonger(): void
     {
-        $count = 0;
-        $account = null;
-        while ($count !== 0 && $account !== null) {
-            $journal     = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first();
+        $loopCount = 0;
+        $account   = null;
+        do {
+            Log::debug(sprintf('Count of loop: %d', $loopCount));
+            $journal     = $this->user()->transactionJournals()->inRandomOrder()->whereNull('deleted_at')->first();
             $count       = $journal->transactions()->where('amount', '>', 0)->count();
             $transaction = $journal->transactions()->where('amount', '>', 0)->first();
             $account     = $transaction->account;
-        }
+            Log::debug(sprintf('Journal with id #%d', $journal->id));
+            Log::debug(sprintf('Count of transactions is %d', $count));
+            Log::debug(sprintf('Account is null: %s', var_export(null === $account, true)));
+        } while ($loopCount < 30 && $count !== 2 && null !== $account);
 
         $trigger = ToAccountStarts::makeFromStrings('bla-bla-bla' . $account->name, false);
         $result  = $trigger->triggered($journal);