From 5676aeac80eea81d535cc722262c91e1072e8a47 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 1 Jul 2018 16:13:22 +0200 Subject: [PATCH] Improve test filter. --- .../Triggers/ToAccountIsTest.php | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/tests/Unit/TransactionRules/Triggers/ToAccountIsTest.php b/tests/Unit/TransactionRules/Triggers/ToAccountIsTest.php index c47e72de14..c06e0ccf1f 100644 --- a/tests/Unit/TransactionRules/Triggers/ToAccountIsTest.php +++ b/tests/Unit/TransactionRules/Triggers/ToAccountIsTest.php @@ -36,13 +36,15 @@ class ToAccountIsTest extends TestCase */ public function testTriggered(): void { - $count = 0; + $count = 0; + $transactionCount = 0; do { - $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); - $transaction = $journal->transactions()->where('amount', '>', 0)->first(); - $account = $transaction->account; + $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); + $transaction = $journal->transactions()->where('amount', '>', 0)->first(); + $transactionCount = $journal->transactions()->count(); + $account = $transaction->account; $count++; - } while ($account === null && $count < 30); + } while ($account === null && $count < 30 && $transactionCount !== 2); $trigger = ToAccountIs::makeFromStrings($account->name, false); $result = $trigger->triggered($journal); @@ -54,13 +56,15 @@ class ToAccountIsTest extends TestCase */ public function testTriggeredNot(): void { - $count = 0; + $count = 0; + $transactionCount = 0; do { - $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); - $transaction = $journal->transactions()->where('amount', '>', 0)->first(); - $account = $transaction->account; + $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); + $transaction = $journal->transactions()->where('amount', '>', 0)->first(); + $transactionCount = $journal->transactions()->count(); + $account = $transaction->account; $count++; - } while ($account === null && $count < 30); + } while ($account === null && $count < 30 && $transactionCount !== 2); $trigger = ToAccountIs::makeFromStrings('some name' . random_int(1, 234), false); $result = $trigger->triggered($journal);