Fix test to always select correct journal.

This commit is contained in:
James Cole 2018-03-07 05:52:45 +01:00
parent dd16e1b784
commit 6c63583e49
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E

View File

@ -36,8 +36,12 @@ class ToAccountStartsTest extends TestCase
*/ */
public function testTriggered() public function testTriggered()
{ {
$journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); $count = 0;
$transaction = $journal->transactions()->where('amount', '>', 0)->first(); while ($count === 0) {
$journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first();
$count = $journal->transactions()->where('amount', '>', 0)->count();
$transaction = $journal->transactions()->where('amount', '>', 0)->first();
}
$account = $transaction->account; $account = $transaction->account;
$trigger = ToAccountStarts::makeFromStrings(substr($account->name, 0, -3), false); $trigger = ToAccountStarts::makeFromStrings(substr($account->name, 0, -3), false);
@ -50,8 +54,12 @@ class ToAccountStartsTest extends TestCase
*/ */
public function testTriggeredLonger() public function testTriggeredLonger()
{ {
$journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); $count = 0;
$transaction = $journal->transactions()->where('amount', '>', 0)->first(); while ($count === 0) {
$journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first();
$count = $journal->transactions()->where('amount', '>', 0)->count();
$transaction = $journal->transactions()->where('amount', '>', 0)->first();
}
$account = $transaction->account; $account = $transaction->account;
$trigger = ToAccountStarts::makeFromStrings('bla-bla-bla' . $account->name, false); $trigger = ToAccountStarts::makeFromStrings('bla-bla-bla' . $account->name, false);