kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-29 18:20:01 +00:00
Code Issues Projects Releases Wiki Activity

Fix unit tests.

Browse Source
This commit is contained in:
James Cole
2018-07-05 20:15:20 +02:00
parent c0d2cd8962
commit 1675a0d442
5 changed files with 37 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
tests/Unit/TransactionRules/Triggers/FromAccountStartsTest.php
View File

@@ -36,12 +36,14 @@ class FromAccountStartsTest extends TestCase
*/
public function testTriggered(): void
{
$transaction = null;
$count = 0;
do {
$journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first();
$transaction = $journal->transactions()->where('amount', '<', 0)->first();
} while (null === $transaction);
$account = $transaction->account;
$journal = $this->user()->transactionJournals()->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 && $transactionCount !== 2);
$trigger = FromAccountStarts::makeFromStrings(substr($account->name, 0, -3), false);
$result = $trigger->triggered($journal);
@@ -53,13 +55,14 @@ class FromAccountStartsTest extends TestCase
*/
public function testTriggeredLonger(): void
{
$transaction = null;
$count = 0;
do {
$journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first();
$transaction = $journal->transactions()->where('amount', '<', 0)->first();
} while (null === $transaction);
$account = $transaction->account;
$journal = $this->user()->transactionJournals()->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 && $transactionCount !== 2);
$trigger = FromAccountStarts::makeFromStrings('bla-bla-bla' . $account->name, false);
$result = $trigger->triggered($journal);

6
tests/Unit/TransactionRules/Triggers/ToAccountIsTest.php
View File

@@ -37,14 +37,13 @@ class ToAccountIsTest extends TestCase
public function testTriggered(): void
{
$count = 0;
$transactionCount = 0;
do {
$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 && $transactionCount !== 1);
} while ($account === null && $count < 30 && $transactionCount !== 2);
$trigger = ToAccountIs::makeFromStrings($account->name, false);
$result = $trigger->triggered($journal);
@@ -57,14 +56,13 @@ class ToAccountIsTest extends TestCase
public function testTriggeredNot(): void
{
$count = 0;
$transactionCount = 0;
do {
$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 && $transactionCount !== 1);
} while ($account === null && $count < 30 && $transactionCount !== 2);
$trigger = ToAccountIs::makeFromStrings('some name' . random_int(1, 234), false);
$result = $trigger->triggered($journal);