From 63d93968d009d9f400cb744703304e741313e798 Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 15 Nov 2017 15:30:15 +0100 Subject: [PATCH] Fix tests. --- app/Export/Entry/Entry.php | 2 +- .../Report/ReportGeneratorInterface.php | 12 ++++++------ app/Helpers/Chart/MetaPieChartInterface.php | 16 ++++++++-------- .../FileProcessor/FileProcessorInterface.php | 2 +- app/TransactionRules/TransactionMatcher.php | 6 +++--- .../2016_06_16_000002_create_main_tables.php | 3 +++ .../TransactionRules/Actions/RemoveTagTest.php | 8 +++----- 7 files changed, 25 insertions(+), 24 deletions(-) diff --git a/app/Export/Entry/Entry.php b/app/Export/Entry/Entry.php index 44271130f1..6b43d3408e 100644 --- a/app/Export/Entry/Entry.php +++ b/app/Export/Entry/Entry.php @@ -93,7 +93,7 @@ final class Entry * * @return Entry */ - public static function fromTransaction(Transaction $transaction): self + public static function fromTransaction(Transaction $transaction): Entry { $entry = new self; $entry->journal_id = $transaction->journal_id; diff --git a/app/Generator/Report/ReportGeneratorInterface.php b/app/Generator/Report/ReportGeneratorInterface.php index f4ff815cc1..c3752b2739 100644 --- a/app/Generator/Report/ReportGeneratorInterface.php +++ b/app/Generator/Report/ReportGeneratorInterface.php @@ -40,40 +40,40 @@ interface ReportGeneratorInterface * * @return ReportGeneratorInterface */ - public function setAccounts(Collection $accounts): self; + public function setAccounts(Collection $accounts): ReportGeneratorInterface; /** * @param Collection $budgets * * @return ReportGeneratorInterface */ - public function setBudgets(Collection $budgets): self; + public function setBudgets(Collection $budgets): ReportGeneratorInterface; /** * @param Collection $categories * * @return ReportGeneratorInterface */ - public function setCategories(Collection $categories): self; + public function setCategories(Collection $categories): ReportGeneratorInterface; /** * @param Carbon $date * * @return ReportGeneratorInterface */ - public function setEndDate(Carbon $date): self; + public function setEndDate(Carbon $date): ReportGeneratorInterface; /** * @param Carbon $date * * @return ReportGeneratorInterface */ - public function setStartDate(Carbon $date): self; + public function setStartDate(Carbon $date): ReportGeneratorInterface; /** * @param Collection $tags * * @return ReportGeneratorInterface */ - public function setTags(Collection $tags): self; + public function setTags(Collection $tags): ReportGeneratorInterface; } diff --git a/app/Helpers/Chart/MetaPieChartInterface.php b/app/Helpers/Chart/MetaPieChartInterface.php index 250b13c7bc..ee094a2e83 100644 --- a/app/Helpers/Chart/MetaPieChartInterface.php +++ b/app/Helpers/Chart/MetaPieChartInterface.php @@ -44,54 +44,54 @@ interface MetaPieChartInterface * * @return MetaPieChartInterface */ - public function setAccounts(Collection $accounts): self; + public function setAccounts(Collection $accounts): MetaPieChartInterface; /** * @param Collection $budgets * * @return MetaPieChartInterface */ - public function setBudgets(Collection $budgets): self; + public function setBudgets(Collection $budgets): MetaPieChartInterface; /** * @param Collection $categories * * @return MetaPieChartInterface */ - public function setCategories(Collection $categories): self; + public function setCategories(Collection $categories): MetaPieChartInterface; /** * @param bool $collectOtherObjects * * @return MetaPieChartInterface */ - public function setCollectOtherObjects(bool $collectOtherObjects): self; + public function setCollectOtherObjects(bool $collectOtherObjects): MetaPieChartInterface; /** * @param Carbon $end * * @return MetaPieChartInterface */ - public function setEnd(Carbon $end): self; + public function setEnd(Carbon $end): MetaPieChartInterface; /** * @param Carbon $start * * @return MetaPieChartInterface */ - public function setStart(Carbon $start): self; + public function setStart(Carbon $start): MetaPieChartInterface; /** * @param Collection $tags * * @return MetaPieChartInterface */ - public function setTags(Collection $tags): self; + public function setTags(Collection $tags): MetaPieChartInterface; /** * @param User $user * * @return MetaPieChartInterface */ - public function setUser(User $user): self; + public function setUser(User $user): MetaPieChartInterface; } diff --git a/app/Import/FileProcessor/FileProcessorInterface.php b/app/Import/FileProcessor/FileProcessorInterface.php index 94fd9bd0a5..e8a480176f 100644 --- a/app/Import/FileProcessor/FileProcessorInterface.php +++ b/app/Import/FileProcessor/FileProcessorInterface.php @@ -45,5 +45,5 @@ interface FileProcessorInterface * * @return FileProcessorInterface */ - public function setJob(ImportJob $job): self; + public function setJob(ImportJob $job): FileProcessorInterface; } diff --git a/app/TransactionRules/TransactionMatcher.php b/app/TransactionRules/TransactionMatcher.php index 73639adf5b..82753bd86a 100644 --- a/app/TransactionRules/TransactionMatcher.php +++ b/app/TransactionRules/TransactionMatcher.php @@ -120,7 +120,7 @@ class TransactionMatcher * * @return TransactionMatcher */ - public function setLimit(int $limit): self + public function setLimit(int $limit): TransactionMatcher { $this->limit = $limit; @@ -140,7 +140,7 @@ class TransactionMatcher * * @return TransactionMatcher */ - public function setRange(int $range): self + public function setRange(int $range): TransactionMatcher { $this->range = $range; @@ -160,7 +160,7 @@ class TransactionMatcher * * @return TransactionMatcher */ - public function setTriggers(array $triggers): self + public function setTriggers(array $triggers): TransactionMatcher { $this->triggers = $triggers; diff --git a/database/migrations/2016_06_16_000002_create_main_tables.php b/database/migrations/2016_06_16_000002_create_main_tables.php index 1eaa6f2fbe..4823ac9e39 100644 --- a/database/migrations/2016_06_16_000002_create_main_tables.php +++ b/database/migrations/2016_06_16_000002_create_main_tables.php @@ -550,6 +550,9 @@ class CreateMainTables extends Migration $table->integer('transaction_journal_id', false, true); $table->foreign('tag_id')->references('id')->on('tags')->onDelete('cascade'); $table->foreign('transaction_journal_id')->references('id')->on('transaction_journals')->onDelete('cascade'); + + // unique combi: + $table->unique(['tag_id', 'transaction_journal_id']); } ); } diff --git a/tests/Unit/TransactionRules/Actions/RemoveTagTest.php b/tests/Unit/TransactionRules/Actions/RemoveTagTest.php index de1674378c..a4134f9aa3 100644 --- a/tests/Unit/TransactionRules/Actions/RemoveTagTest.php +++ b/tests/Unit/TransactionRules/Actions/RemoveTagTest.php @@ -72,13 +72,11 @@ class RemoveTagTest extends TestCase public function testActNoTag() { // get journal, link al tags: + /** @var TransactionJournal $journal */ $journal = TransactionJournal::find(11); $tags = $journal->user->tags()->get(); - foreach ($tags as $tag) { - $journal->tags()->save($tag); - $journal->save(); - } - $this->assertEquals($tags->count(), $journal->tags()->count()); + $journal->tags()->sync($tags->pluck('id')->toArray()); + $this->assertEquals($tags->count(), $journal->tags()->get()->count()); // fire the action: $ruleAction = new RuleAction;