kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Fix unit tests.

Browse Source
This commit is contained in:
James Cole
2018-07-05 19:02:22 +02:00
parent 666e9897ea
commit 146c9fd947
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/Unit/TransactionRules/Triggers/HasNoBudgetTest.php
View File

@@ -37,7 +37,7 @@ class HasNoBudgetTest extends TestCase
*/ */
public function testTriggeredBudget(): void public function testTriggeredBudget(): void
{ {
$journal = TransactionJournal::inRandomOrder()->where('transaction_type_id', 1)->whereNull('deleted_at')->first(); $journal = $this->user()->transactionJournals()->inRandomOrder()->where('transaction_type_id', 1)->whereNull('deleted_at')->first();
$budget = $journal->user->budgets()->first(); $budget = $journal->user->budgets()->first();
$journal->budgets()->detach(); $journal->budgets()->detach();
$journal->budgets()->save($budget); $journal->budgets()->save($budget);
@@ -54,7 +54,7 @@ class HasNoBudgetTest extends TestCase
public function testTriggeredNoBudget(): void public function testTriggeredNoBudget(): void
{ {
/** @var TransactionJournal $journal */ /** @var TransactionJournal $journal */
$journal = TransactionJournal::inRandomOrder()->where('transaction_type_id', 1)->whereNull('deleted_at')->first(); $journal = $this->user()->transactionJournals()->inRandomOrder()->where('transaction_type_id', 1)->whereNull('deleted_at')->first();
$journal->budgets()->detach(); $journal->budgets()->detach();
/** @var Transaction $transaction */ /** @var Transaction $transaction */
foreach ($journal->transactions as $transaction) { foreach ($journal->transactions as $transaction) {
@@ -72,8 +72,12 @@ class HasNoBudgetTest extends TestCase
*/ */
public function testTriggeredTransaction(): void public function testTriggeredTransaction(): void
{ {
/** @var TransactionJournal $journal */ $loopCount = 0;
$journal = TransactionJournal::inRandomOrder()->where('transaction_type_id', 1)->whereNull('deleted_at')->first(); do {
$journal = $this->user()->transactionJournals()->inRandomOrder()->whereNull('deleted_at')->first();
$count = $journal->transactions()->count();
} while ($loopCount < 30 && $count !== 2);
$transactions = $journal->transactions()->get(); $transactions = $journal->transactions()->get();
$budget = $journal->user->budgets()->first(); $budget = $journal->user->budgets()->first();

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

@@ -50,7 +50,7 @@ class ToAccountStartsTest extends TestCase
Log::debug(sprintf('Journal with id #%d', $journal->id)); Log::debug(sprintf('Journal with id #%d', $journal->id));
Log::debug(sprintf('Count of transactions is %d', $count)); Log::debug(sprintf('Count of transactions is %d', $count));
Log::debug(sprintf('Account is null: %s', var_export(null === $account, true))); Log::debug(sprintf('Account is null: %s', var_export(null === $account, true)));
} while ($loopCount < 30 && $count !== 2 && null !== $account); } while ($loopCount < 30 && $count !== 1 && null !== $account);
$trigger = ToAccountStarts::makeFromStrings(substr($account->name, 0, -3), false); $trigger = ToAccountStarts::makeFromStrings(substr($account->name, 0, -3), false);
@@ -63,6 +63,7 @@ class ToAccountStartsTest extends TestCase
*/ */
public function testTriggeredLonger(): void public function testTriggeredLonger(): void
{ {
Log::debug('Now in testTriggeredLonger');
$loopCount = 0; $loopCount = 0;
$account = null; $account = null;
do { do {
@@ -74,7 +75,8 @@ class ToAccountStartsTest extends TestCase
Log::debug(sprintf('Journal with id #%d', $journal->id)); Log::debug(sprintf('Journal with id #%d', $journal->id));
Log::debug(sprintf('Count of transactions is %d', $count)); Log::debug(sprintf('Count of transactions is %d', $count));
Log::debug(sprintf('Account is null: %s', var_export(null === $account, true))); Log::debug(sprintf('Account is null: %s', var_export(null === $account, true)));
} while ($loopCount < 30 && $count !== 2 && null !== $account); } while ($loopCount < 30 && $count !== 1 && null !== $account);
Log::debug(sprintf('Loop has ended. loopCount is %d', $loopCount));
$trigger = ToAccountStarts::makeFromStrings('bla-bla-bla' . $account->name, false); $trigger = ToAccountStarts::makeFromStrings('bla-bla-bla' . $account->name, false);
$result = $trigger->triggered($journal); $result = $trigger->triggered($journal);