From 5e57a390a20def4c90bba4a18617bc90d0d59994 Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 15 Jun 2015 19:25:54 +0200 Subject: [PATCH] Fixed tests. --- app/Models/Tag.php | 2 +- app/Models/TransactionJournal.php | 19 ++++++++++--------- tests/models/TransactionJournalModelTest.php | 6 ++++++ 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/app/Models/Tag.php b/app/Models/Tag.php index 314ca4fd19..27c7703ed7 100644 --- a/app/Models/Tag.php +++ b/app/Models/Tag.php @@ -110,7 +110,7 @@ class Tag extends Model $journal->tag_count = $count; $journal->save(); } - parent::save($options); + return parent::save($options); } /** diff --git a/app/Models/TransactionJournal.php b/app/Models/TransactionJournal.php index 8282695824..d4eccee6d3 100644 --- a/app/Models/TransactionJournal.php +++ b/app/Models/TransactionJournal.php @@ -214,6 +214,15 @@ class TransactionJournal extends Model } + /** + * @codeCoverageIgnore + * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany + */ + public function tags() + { + return $this->belongsToMany('FireflyIII\Models\Tag'); + } + /** * @param string $amount * @@ -279,16 +288,8 @@ class TransactionJournal extends Model { $count = $this->tags()->count(); $this->tag_count = $count; - parent::save($options); - } - /** - * @codeCoverageIgnore - * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany - */ - public function tags() - { - return $this->belongsToMany('FireflyIII\Models\Tag'); + return parent::save($options); } /** diff --git a/tests/models/TransactionJournalModelTest.php b/tests/models/TransactionJournalModelTest.php index 7b11897571..cc7d59ec92 100644 --- a/tests/models/TransactionJournalModelTest.php +++ b/tests/models/TransactionJournalModelTest.php @@ -109,6 +109,9 @@ class TransactionJournalModelTest extends TestCase $tag->transactionJournals()->save($withdrawal); $tag->transactionJournals()->save($deposit); + $withdrawal->save(); + $deposit->save(); + // amount should be 210.12: $this->assertEquals('210.12', $withdrawal->amount); $this->assertEquals('0', $deposit->amount); @@ -175,8 +178,11 @@ class TransactionJournalModelTest extends TestCase $transfer->transactions[1]->amount = 123.45; $transfer->transactions[1]->save(); + $withdrawal->save(); $amount = $withdrawal->amount; + + $this->assertEquals('0', $amount); }