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

Various fixes for tests and code quality.

Browse Source
This commit is contained in:
James Cole
2018-07-20 20:53:48 +02:00
parent 49ff6febe5
commit ec7ef3a813
28 changed files with 79 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/Unit/TransactionRules/Triggers/FromAccountIsTest.php
View File

@@ -41,7 +41,7 @@ class FromAccountIsTest extends TestCase
/** @var TransactionJournal $journal */
$journal = $this->user()->transactionJournals()->inRandomOrder()->whereNull('deleted_at')->first();
$transaction = $journal->transactions()->where('amount', '<', 0)->first();
$account = $transaction->account;
$account = null === $transaction ? null : $transaction->account;
$count = $journal->transactions()->count();
Log::debug(sprintf('Loop: %d, transaction count: %d, account is null: %d', $loops, $count, (int)null===$account));

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

@@ -52,7 +52,7 @@ class FromAccountStartsTest extends TestCase
/** @var TransactionJournal $journal */
$journal = $this->user()->transactionJournals()->inRandomOrder()->whereNull('deleted_at')->first();
$transaction = $journal->transactions()->where('amount', '<', 0)->first();
$account = $transaction->account;
$account = null === $transaction ? null : $transaction->account;
$count = $journal->transactions()->count();
$name = $account->name ?? '';
@@ -83,7 +83,7 @@ class FromAccountStartsTest extends TestCase
/** @var TransactionJournal $journal */
$journal = $this->user()->transactionJournals()->inRandomOrder()->whereNull('deleted_at')->first();
$transaction = $journal->transactions()->where('amount', '<', 0)->first();
$account = $transaction->account;
$account = null === $transaction ? null : $transaction->account;
$count = $journal->transactions()->count();
$name = $account->name ?? '';

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

@@ -42,7 +42,7 @@ class ToAccountEndsTest extends TestCase
/** @var TransactionJournal $journal */
$journal = $this->user()->transactionJournals()->inRandomOrder()->whereNull('deleted_at')->first();
$transaction = $journal->transactions()->where('amount', '>', 0)->first();
$account = $transaction->account;
$account = null === $transaction ? null : $transaction->account;
$count = $journal->transactions()->count();
$name = $account->name ?? '';
@@ -73,7 +73,7 @@ class ToAccountEndsTest extends TestCase
/** @var TransactionJournal $journal */
$journal = $this->user()->transactionJournals()->inRandomOrder()->whereNull('deleted_at')->first();
$transaction = $journal->transactions()->where('amount', '>', 0)->first();
$account = $transaction->account;
$account = null === $transaction ? null : $transaction->account;
$count = $journal->transactions()->count();
$name = $account->name ?? '';
@@ -103,7 +103,7 @@ class ToAccountEndsTest extends TestCase
/** @var TransactionJournal $journal */
$journal = $this->user()->transactionJournals()->inRandomOrder()->whereNull('deleted_at')->first();
$transaction = $journal->transactions()->where('amount', '>', 0)->first();
$account = $transaction->account;
$account = null === $transaction ? null : $transaction->account;
$count = $journal->transactions()->count();
$name = $account->name ?? '';

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

@@ -42,7 +42,7 @@ class ToAccountIsTest extends TestCase
/** @var TransactionJournal $journal */
$journal = $this->user()->transactionJournals()->inRandomOrder()->whereNull('deleted_at')->first();
$transaction = $journal->transactions()->where('amount', '>', 0)->first();
$account = $transaction->account;
$account = null === $transaction ? null : $transaction->account;
$count = $journal->transactions()->count();
Log::debug(sprintf('Loop: %d, transaction count: %d, account is null: %d', $loops, $count, (int)null===$account));
@@ -69,7 +69,7 @@ class ToAccountIsTest extends TestCase
/** @var TransactionJournal $journal */
$journal = $this->user()->transactionJournals()->inRandomOrder()->whereNull('deleted_at')->first();
$transaction = $journal->transactions()->where('amount', '>', 0)->first();
$account = $transaction->account;
$account = null === $transaction ? null : $transaction->account;
$count = $journal->transactions()->count();
Log::debug(sprintf('Loop: %d, transaction count: %d, account is null: %d', $loops, $count, (int)null===$account));

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

@@ -44,10 +44,10 @@ class ToAccountStartsTest extends TestCase
/** @var TransactionJournal $journal */
$journal = $this->user()->transactionJournals()->inRandomOrder()->whereNull('deleted_at')->first();
$transaction = $journal->transactions()->where('amount', '>', 0)->first();
$account = $transaction->account;
$account = null === $transaction ? null : $transaction->account;
$count = $journal->transactions()->count();
Log::debug(sprintf('Loop: %d, transaction count: %d, account is null: %d', $loops, $count, (int)null===$account));
Log::debug(sprintf('Loop: %d, transaction count: %d, account is null: %d', $loops, $count, (int)null === $account));
$loops++;
@@ -73,10 +73,10 @@ class ToAccountStartsTest extends TestCase
/** @var TransactionJournal $journal */
$journal = $this->user()->transactionJournals()->inRandomOrder()->whereNull('deleted_at')->first();
$transaction = $journal->transactions()->where('amount', '>', 0)->first();
$account = $transaction->account;
$account = null === $transaction ? null : $transaction->account;
$count = $journal->transactions()->count();
Log::debug(sprintf('Loop: %d, transaction count: %d, account is null: %d', $loops, $count, (int)null===$account));
Log::debug(sprintf('Loop: %d, transaction count: %d, account is null: %d', $loops, $count, (int)null === $account));
$loops++;