From b1e742c26cfc66db79b16a54b3e069f560b84293 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Thu, 27 Sep 2018 13:11:31 +0200
Subject: [PATCH] Fix tests.

---
 .../V1/Controllers/AttachmentControllerTest.php    | 14 ++++++++------
 tests/Api/V1/Controllers/BillControllerTest.php    |  9 +++++++--
 tests/Feature/Controllers/BillControllerTest.php   |  5 +++++
 tests/Unit/Transformers/BillTransformerTest.php    |  1 +
 4 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/tests/Api/V1/Controllers/AttachmentControllerTest.php b/tests/Api/V1/Controllers/AttachmentControllerTest.php
index f18ee9087f..ac515576e0 100644
--- a/tests/Api/V1/Controllers/AttachmentControllerTest.php
+++ b/tests/Api/V1/Controllers/AttachmentControllerTest.php
@@ -177,8 +177,9 @@ class AttachmentControllerTest extends TestCase
 
 
         // mock calls:
-        $repository->shouldReceive('setUser')->once();
+        $repository->shouldReceive('setUser');
         $repository->shouldReceive('get')->once()->andReturn($attachments);
+        $repository->shouldReceive('getNoteText')->andReturn('Hi There');
 
         // test API
         $response = $this->get('/api/v1/attachments');
@@ -205,7 +206,8 @@ class AttachmentControllerTest extends TestCase
 
 
         // mock calls:
-        $repository->shouldReceive('setUser')->once();
+        $repository->shouldReceive('setUser');
+        $repository->shouldReceive('getNoteText')->andReturn('Hi There');
 
         // test API
         $response = $this->get('/api/v1/attachments/' . $attachment->id);
@@ -234,9 +236,9 @@ class AttachmentControllerTest extends TestCase
 
 
         // mock calls:
-        $repository->shouldReceive('setUser')->once();
+        $repository->shouldReceive('setUser')->atLeast()->once();
         $repository->shouldReceive('store')->once()->andReturn($attachment);
-
+        $repository->shouldReceive('getNoteText')->andReturn('Hi There');
         $journalRepos->shouldReceive('setUser')->once();
         $journalRepos->shouldReceive('findNull')->once()->andReturn($this->user()->transactionJournals()->find(1));
 
@@ -274,9 +276,9 @@ class AttachmentControllerTest extends TestCase
         $attachment = $this->user()->attachments()->first();
 
         // mock calls:
-        $repository->shouldReceive('setUser');
+        $repository->shouldReceive('setUser')->atLeast()->once();
         $repository->shouldReceive('update')->once()->andReturn($attachment);
-
+        $repository->shouldReceive('getNoteText')->andReturn('Hi There');
         // data to submit
         $data = [
             'filename'    => $attachment->filename,
diff --git a/tests/Api/V1/Controllers/BillControllerTest.php b/tests/Api/V1/Controllers/BillControllerTest.php
index d7cde583c6..15b4ea1069 100644
--- a/tests/Api/V1/Controllers/BillControllerTest.php
+++ b/tests/Api/V1/Controllers/BillControllerTest.php
@@ -87,6 +87,7 @@ class BillControllerTest extends TestCase
         $repository->shouldReceive('setUser');
         $repository->shouldReceive('getPaginator')->withAnyArgs()->andReturn($paginator)->once();
         $repository->shouldReceive('getRulesForBill')->withAnyArgs()->andReturn(new Collection());
+        $repository->shouldReceive('getNoteText')->andReturn('Hi there');
 
         // test API
         $response = $this->get('/api/v1/bills');
@@ -113,6 +114,7 @@ class BillControllerTest extends TestCase
         // mock calls:
         $repository->shouldReceive('setUser');
         $repository->shouldReceive('getRulesForBill')->withAnyArgs()->andReturn(new Collection());
+        $repository->shouldReceive('getNoteText')->andReturn('Hi there');
         // test API
         $response = $this->get('/api/v1/bills/' . $bill->id);
         $response->assertStatus(200);
@@ -140,6 +142,7 @@ class BillControllerTest extends TestCase
         // mock calls:
         $repository->shouldReceive('setUser')->once();
         $repository->shouldReceive('store')->andReturn($bill);
+        $repository->shouldReceive('getNoteText')->andReturn('Hi there');
 
         // data to submit:
         $data = [
@@ -183,8 +186,9 @@ class BillControllerTest extends TestCase
         $repository = $this->mock(BillRepositoryInterface::class);
 
         // mock calls:
-        $repository->shouldReceive('setUser')->times(2);
+        $repository->shouldReceive('setUser')->atLeast()->times(2);
         $repository->shouldReceive('store')->andReturn($bill);
+        $repository->shouldReceive('getNoteText')->andReturn('Hi there');
         $repository->shouldReceive('getRulesForBill')->withAnyArgs()->andReturn(new Collection());
         // data to submit:
         $data = [
@@ -222,7 +226,8 @@ class BillControllerTest extends TestCase
         $repository = $this->mock(BillRepositoryInterface::class);
 
         // mock calls:
-        $repository->shouldReceive('setUser')->times(2);
+        $repository->shouldReceive('setUser')->atleast()->times(2);
+        $repository->shouldReceive('getNoteText')->andReturn('Hi there');
         $repository->shouldReceive('update')->andReturn($bill);
         $repository->shouldReceive('getRulesForBill')->withAnyArgs()->andReturn(new Collection());
         // data to submit:
diff --git a/tests/Feature/Controllers/BillControllerTest.php b/tests/Feature/Controllers/BillControllerTest.php
index 46463ccfc2..901e93519e 100644
--- a/tests/Feature/Controllers/BillControllerTest.php
+++ b/tests/Feature/Controllers/BillControllerTest.php
@@ -174,6 +174,7 @@ class BillControllerTest extends TestCase
         $collection = new Collection([$bill]);
         $repository->shouldReceive('getPaginator')->andReturn(new LengthAwarePaginator($collection, 1, 50))->once();
         $repository->shouldReceive('setUser');
+        $repository->shouldReceive('getNoteText')->andReturn('Hi there');
         $repository->shouldReceive('getPaidDatesInRange')->twice()->andReturn(new Collection([new Carbon, new Carbon, new Carbon]));
         $repository->shouldReceive('getRulesForBills')->andReturn([]);
 
@@ -259,12 +260,14 @@ class BillControllerTest extends TestCase
         $repository->shouldReceive('getOverallAverage')->andReturn('0');
         $repository->shouldReceive('nextExpectedMatch')->andReturn(new Carbon);
         $repository->shouldReceive('getRulesForBill')->andReturn(new Collection);
+        $repository->shouldReceive('getNoteText')->andReturn('Hi there');
         $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal);
 
         $collector->shouldReceive('setAllAssetAccounts')->andReturnSelf();
         $collector->shouldReceive('setBills')->andReturnSelf();
         $collector->shouldReceive('setLimit')->andReturnSelf();
         $collector->shouldReceive('setPage')->andReturnSelf();
+
         $collector->shouldReceive('withBudgetInformation')->andReturnSelf();
         $collector->shouldReceive('withCategoryInformation')->andReturnSelf();
         $collector->shouldReceive('getPaginatedTransactions')->andReturn(new LengthAwarePaginator([], 0, 10));
@@ -276,6 +279,8 @@ class BillControllerTest extends TestCase
         $response->assertStatus(200);
         // has bread crumb
         $response->assertSee('<ol class="breadcrumb">');
+        $response->assertSee('Hi there');
+
     }
 
     /**
diff --git a/tests/Unit/Transformers/BillTransformerTest.php b/tests/Unit/Transformers/BillTransformerTest.php
index ea5e764c44..5adf47d49b 100644
--- a/tests/Unit/Transformers/BillTransformerTest.php
+++ b/tests/Unit/Transformers/BillTransformerTest.php
@@ -75,6 +75,7 @@ class BillTransformerTest extends TestCase
         // mock stuff
         $repository = $this->mock(BillRepositoryInterface::class);
         $repository->shouldReceive('setUser')->andReturnSelf();
+        $repository->shouldReceive('getNoteText')->andReturn('Hi there');
         $repository->shouldReceive('getPaidDatesInRange')->andReturn(new Collection([new Carbon('2018-01-02')]));
         $bill       = Bill::create(
             [