From 378b4abaf11cf511102e84e809a2811d7b08034a Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Fri, 24 Nov 2017 23:05:44 +0100
Subject: [PATCH] Fix tests.

---
 .../Controllers/BudgetControllerTest.php      |  2 ++
 .../Actions/RemoveAllTagsTest.php             | 15 ++++++-------
 .../Actions/RemoveTagTest.php                 | 21 +++++++++----------
 3 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/tests/Feature/Controllers/BudgetControllerTest.php b/tests/Feature/Controllers/BudgetControllerTest.php
index 4cb5a4f24e..7bfc7d4e73 100644
--- a/tests/Feature/Controllers/BudgetControllerTest.php
+++ b/tests/Feature/Controllers/BudgetControllerTest.php
@@ -53,6 +53,7 @@ class BudgetControllerTest extends TestCase
         $journalRepos = $this->mock(JournalRepositoryInterface::class);
         $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal);
         $repository->shouldReceive('updateLimitAmount')->andReturn(new BudgetLimit);
+        $repository->shouldReceive('spentInPeriod')->andReturn('0');
 
         $data = ['amount' => 200, 'start' => '2017-01-01', 'end' => '2017-01-31'];
         $this->be($this->user());
@@ -70,6 +71,7 @@ class BudgetControllerTest extends TestCase
         $journalRepos = $this->mock(JournalRepositoryInterface::class);
         $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal);
         $repository->shouldReceive('updateLimitAmount')->andReturn(new BudgetLimit);
+        $repository->shouldReceive('spentInPeriod')->andReturn('0');
 
         $data = ['amount' => 0, 'start' => '2017-01-01', 'end' => '2017-01-31'];
         $this->be($this->user());
diff --git a/tests/Unit/TransactionRules/Actions/RemoveAllTagsTest.php b/tests/Unit/TransactionRules/Actions/RemoveAllTagsTest.php
index 2a0f961329..757d0c12bb 100644
--- a/tests/Unit/TransactionRules/Actions/RemoveAllTagsTest.php
+++ b/tests/Unit/TransactionRules/Actions/RemoveAllTagsTest.php
@@ -26,7 +26,7 @@ use FireflyIII\Models\RuleAction;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\TransactionRules\Actions\RemoveAllTags;
 use Tests\TestCase;
-
+use DB;
 /**
  * Class RemoveAllTagsTest
  */
@@ -38,14 +38,11 @@ class RemoveAllTagsTest extends TestCase
      */
     public function testAct()
     {
-        // get journal, link al tags:
-        $journal = TransactionJournal::find(9);
-        $tags    = $journal->user->tags()->get();
-        foreach ($tags as $tag) {
-            $journal->tags()->save($tag);
-            $journal->save();
-        }
-        $this->assertGreaterThan(0, $journal->tags()->count());
+        // find journal with at least one tag
+        $journalIds = DB::table('tag_transaction_journal')->get(['transaction_journal_id'])->pluck('transaction_journal_id')->toArray();
+        $journalId  = intval($journalIds[0]);
+        /** @var TransactionJournal $journal */
+        $journal = TransactionJournal::find($journalId);
 
         // fire the action:
         $ruleAction               = new RuleAction;
diff --git a/tests/Unit/TransactionRules/Actions/RemoveTagTest.php b/tests/Unit/TransactionRules/Actions/RemoveTagTest.php
index b76f81f4f3..8cac742494 100644
--- a/tests/Unit/TransactionRules/Actions/RemoveTagTest.php
+++ b/tests/Unit/TransactionRules/Actions/RemoveTagTest.php
@@ -22,6 +22,7 @@ declare(strict_types=1);
 
 namespace Tests\Unit\TransactionRules\Actions;
 
+use DB;
 use FireflyIII\Models\RuleAction;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\TransactionRules\Actions\RemoveTag;
@@ -38,16 +39,14 @@ class RemoveTagTest extends TestCase
      */
     public function testAct()
     {
-        // get journal, link al tags:
-        $journal = TransactionJournal::find(10);
-        $tags    = $journal->user->tags()->get();
-        foreach ($tags as $tag) {
-            $journal->tags()->save($tag);
-            $journal->save();
-        }
-        $firstTag = $tags->first();
-        $oldCount = $journal->tags()->count();
-        $this->assertGreaterThan(0, $journal->tags()->count());
+
+        // find journal with at least one tag
+        $journalIds = DB::table('tag_transaction_journal')->get(['transaction_journal_id'])->pluck('transaction_journal_id')->toArray();
+        $journalId  = intval($journalIds[0]);
+        /** @var TransactionJournal $journal */
+        $journal       = TransactionJournal::find($journalId);
+        $originalCount = $journal->tags()->count();
+        $firstTag      = $journal->tags()->first();
 
         // fire the action:
         $ruleAction               = new RuleAction;
@@ -58,7 +57,7 @@ class RemoveTagTest extends TestCase
         foreach ($journal->tags()->get() as $tag) {
             $this->assertNotEquals($firstTag->id, $tag->id);
         }
-        $this->assertEquals(($oldCount - 1), $journal->tags()->count());
+        $this->assertEquals(($originalCount - 1), $journal->tags()->count());
     }
 
     /**