From a23d97563f7907efb5299eaa3102ed3bdecb2d91 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Thu, 1 Mar 2018 21:39:31 +0100
Subject: [PATCH] Fix tests that selected split journals.

---
 .../Actions/SetDestinationAccountTest.php     | 37 ++++++++++++++-----
 .../Actions/SetSourceAccountTest.php          | 22 ++++++++++-
 2 files changed, 48 insertions(+), 11 deletions(-)

diff --git a/tests/Unit/TransactionRules/Actions/SetDestinationAccountTest.php b/tests/Unit/TransactionRules/Actions/SetDestinationAccountTest.php
index 7458c0c5f4..bad202d8f9 100644
--- a/tests/Unit/TransactionRules/Actions/SetDestinationAccountTest.php
+++ b/tests/Unit/TransactionRules/Actions/SetDestinationAccountTest.php
@@ -48,9 +48,18 @@ class SetDestinationAccountTest extends TestCase
      */
     public function testActDepositExisting()
     {
-        $accountRepos  = $this->mock(AccountRepositoryInterface::class);
-        $type          = TransactionType::whereType(TransactionType::DEPOSIT)->first();
-        $journal       = TransactionJournal::where('transaction_type_id', $type->id)->first();
+        $accountRepos = $this->mock(AccountRepositoryInterface::class);
+        $type         = TransactionType::whereType(TransactionType::DEPOSIT)->first();
+
+        // select split transactions to exclude them later:
+        $set = TransactionJournal::where('transaction_type_id', $type->id)->get(['transaction_journals.*']);
+        foreach ($set as $current) {
+            if ($current->transactions()->count() === 2) {
+                $journal = $current;
+                break;
+            }
+        }
+
         $destinationTr = $journal->transactions()->where('amount', '>', 0)->first();
         $destination   = $destinationTr->account;
         $user          = $journal->user;
@@ -88,7 +97,17 @@ class SetDestinationAccountTest extends TestCase
     {
         $accountRepos  = $this->mock(AccountRepositoryInterface::class);
         $type          = TransactionType::whereType(TransactionType::WITHDRAWAL)->first();
-        $journal       = TransactionJournal::where('transaction_type_id', $type->id)->first();
+
+        // select split transactions to exclude them later:
+        $set = TransactionJournal::where('transaction_type_id', $type->id)->get(['transaction_journals.*']);
+        foreach ($set as $current) {
+            if ($current->transactions()->count() === 2) {
+                $journal = $current;
+                break;
+            }
+        }
+
+
         $destinationTr = $journal->transactions()->where('amount', '>', 0)->first();
         $destination   = $destinationTr->account;
         $user          = $journal->user;
@@ -123,11 +142,11 @@ class SetDestinationAccountTest extends TestCase
      */
     public function testSplitJournal()
     {
-        $accountRepos  = $this->mock(AccountRepositoryInterface::class);
-        $transaction = Transaction::orderBy('count', 'DESC')->groupBy('transaction_journal_id')
-                                  ->get(['transaction_journal_id', DB::raw('COUNT(transaction_journal_id) as count')])
-                                  ->first();
-        $journal     = TransactionJournal::find($transaction->transaction_journal_id);
+        $accountRepos = $this->mock(AccountRepositoryInterface::class);
+        $transaction  = Transaction::orderBy('count', 'DESC')->groupBy('transaction_journal_id')
+                                   ->get(['transaction_journal_id', DB::raw('COUNT(transaction_journal_id) as count')])
+                                   ->first();
+        $journal      = TransactionJournal::find($transaction->transaction_journal_id);
 
         // mock
         $accountRepos->shouldReceive('setUser');
diff --git a/tests/Unit/TransactionRules/Actions/SetSourceAccountTest.php b/tests/Unit/TransactionRules/Actions/SetSourceAccountTest.php
index d0cd1e1b74..7ba1f2bb11 100644
--- a/tests/Unit/TransactionRules/Actions/SetSourceAccountTest.php
+++ b/tests/Unit/TransactionRules/Actions/SetSourceAccountTest.php
@@ -50,7 +50,16 @@ class SetSourceAccountTest extends TestCase
 
 
         $type        = TransactionType::whereType(TransactionType::DEPOSIT)->first();
-        $journal     = TransactionJournal::where('transaction_type_id', $type->id)->first();
+
+        // select split transactions to exclude them later:
+        $set = TransactionJournal::where('transaction_type_id', $type->id)->get(['transaction_journals.*']);
+        foreach ($set as $current) {
+            if ($current->transactions()->count() === 2) {
+                $journal = $current;
+                break;
+            }
+        }
+
         $sourceTr    = $journal->transactions()->where('amount', '<', 0)->first();
         $source      = $sourceTr->account;
         $user        = $journal->user;
@@ -88,7 +97,16 @@ class SetSourceAccountTest extends TestCase
     {
         $accountRepos = $this->mock(AccountRepositoryInterface::class);
         $type         = TransactionType::whereType(TransactionType::WITHDRAWAL)->first();
-        $journal      = TransactionJournal::where('transaction_type_id', $type->id)->first();
+
+        // select split transactions to exclude them later:
+        $set = TransactionJournal::where('transaction_type_id', $type->id)->get(['transaction_journals.*']);
+        foreach ($set as $current) {
+            if ($current->transactions()->count() === 2) {
+                $journal = $current;
+                break;
+            }
+        }
+
         $sourceTr     = $journal->transactions()->where('amount', '<', 0)->first();
         $source       = $sourceTr->account;
         $user         = $journal->user;