Updated files for 4.7.5.2

This commit is contained in:
James Cole
2018-07-28 12:10:25 +02:00
parent 0c7b652a70
commit 6d4956b574
10 changed files with 109 additions and 40 deletions

View File

@@ -22,6 +22,7 @@ declare(strict_types=1);
namespace Tests\Unit\TransactionRules\Triggers;
use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\TransactionRules\Triggers\BudgetIs;
use Illuminate\Support\Collection;
@@ -88,7 +89,9 @@ class BudgetIsTest extends TestCase
$budget = $journal->user->budgets()->first();
$journal->budgets()->detach();
/** @var Transaction $transaction */
foreach($transactions as $transaction) {
$transaction->budgets()->detach();
$transaction->budgets()->save($budget);
$this->assertEquals(1, $transaction->budgets()->count());
}

View File

@@ -39,7 +39,7 @@ class CategoryIsTest extends TestCase
do {
$journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first();
$transactions = $journal->transactions()->count();
} while ($transactions === 0);
} while ($transactions !== 2);
$category = $journal->user->categories()->first();
$journal->categories()->detach();
@@ -59,7 +59,7 @@ class CategoryIsTest extends TestCase
do {
$journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first();
$transactions = $journal->transactions()->count();
} while ($transactions === 0);
} while ($transactions !== 2);
$category = $journal->user->categories()->first();
$otherCategory = $journal->user->categories()->where('id', '!=', $category->id)->first();
@@ -80,7 +80,7 @@ class CategoryIsTest extends TestCase
do {
$journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first();
$transactions = $journal->transactions()->count();
} while ($transactions === 0);
} while ($transactions !== 2);
$transaction = $journal->transactions()->first();
$category = $journal->user->categories()->first();