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

Fix tests that selected split journals.

Browse Source
This commit is contained in:
James Cole
2018-03-01 21:39:31 +01:00
parent bf538e2514
commit a23d97563f
2 changed files with 48 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
tests/Unit/TransactionRules/Actions/SetDestinationAccountTest.php
View File

@@ -50,7 +50,16 @@ class SetDestinationAccountTest extends TestCase
{ {
$accountRepos = $this->mock(AccountRepositoryInterface::class); $accountRepos = $this->mock(AccountRepositoryInterface::class);
$type = TransactionType::whereType(TransactionType::DEPOSIT)->first(); $type = TransactionType::whereType(TransactionType::DEPOSIT)->first();
$journal = TransactionJournal::where('transaction_type_id', $type->id)->first();
// select split transactions to exclude them later:
$set = TransactionJournal::where('transaction_type_id', $type->id)->get(['transaction_journals.*']);
foreach ($set as $current) {
if ($current->transactions()->count() === 2) {
$journal = $current;
break;
}
}
$destinationTr = $journal->transactions()->where('amount', '>', 0)->first(); $destinationTr = $journal->transactions()->where('amount', '>', 0)->first();
$destination = $destinationTr->account; $destination = $destinationTr->account;
$user = $journal->user; $user = $journal->user;
@@ -88,7 +97,17 @@ class SetDestinationAccountTest extends TestCase
{ {
$accountRepos = $this->mock(AccountRepositoryInterface::class); $accountRepos = $this->mock(AccountRepositoryInterface::class);
$type = TransactionType::whereType(TransactionType::WITHDRAWAL)->first(); $type = TransactionType::whereType(TransactionType::WITHDRAWAL)->first();
$journal = TransactionJournal::where('transaction_type_id', $type->id)->first();
// select split transactions to exclude them later:
$set = TransactionJournal::where('transaction_type_id', $type->id)->get(['transaction_journals.*']);
foreach ($set as $current) {
if ($current->transactions()->count() === 2) {
$journal = $current;
break;
}
}
$destinationTr = $journal->transactions()->where('amount', '>', 0)->first(); $destinationTr = $journal->transactions()->where('amount', '>', 0)->first();
$destination = $destinationTr->account; $destination = $destinationTr->account;
$user = $journal->user; $user = $journal->user;

22
tests/Unit/TransactionRules/Actions/SetSourceAccountTest.php
View File

@@ -50,7 +50,16 @@ class SetSourceAccountTest extends TestCase
$type = TransactionType::whereType(TransactionType::DEPOSIT)->first(); $type = TransactionType::whereType(TransactionType::DEPOSIT)->first();
$journal = TransactionJournal::where('transaction_type_id', $type->id)->first();
// select split transactions to exclude them later:
$set = TransactionJournal::where('transaction_type_id', $type->id)->get(['transaction_journals.*']);
foreach ($set as $current) {
if ($current->transactions()->count() === 2) {
$journal = $current;
break;
}
}
$sourceTr = $journal->transactions()->where('amount', '<', 0)->first(); $sourceTr = $journal->transactions()->where('amount', '<', 0)->first();
$source = $sourceTr->account; $source = $sourceTr->account;
$user = $journal->user; $user = $journal->user;
@@ -88,7 +97,16 @@ class SetSourceAccountTest extends TestCase
{ {
$accountRepos = $this->mock(AccountRepositoryInterface::class); $accountRepos = $this->mock(AccountRepositoryInterface::class);
$type = TransactionType::whereType(TransactionType::WITHDRAWAL)->first(); $type = TransactionType::whereType(TransactionType::WITHDRAWAL)->first();
$journal = TransactionJournal::where('transaction_type_id', $type->id)->first();
// select split transactions to exclude them later:
$set = TransactionJournal::where('transaction_type_id', $type->id)->get(['transaction_journals.*']);
foreach ($set as $current) {
if ($current->transactions()->count() === 2) {
$journal = $current;
break;
}
}
$sourceTr = $journal->transactions()->where('amount', '<', 0)->first(); $sourceTr = $journal->transactions()->where('amount', '<', 0)->first();
$source = $sourceTr->account; $source = $sourceTr->account;
$user = $journal->user; $user = $journal->user;