From de1bf42f945f38e9a89e6f3df8210d67ab38840f Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Thu, 17 Jul 2014 05:48:14 +0200
Subject: [PATCH] Tests fixed.

---
 .../controllers/TransactionControllerTest.php | 62 +++++++++++++++++++
 app/tests/models/AllModelsTest.php            |  4 ++
 app/views/partials/menu/shared.blade.php      |  5 +-
 3 files changed, 69 insertions(+), 2 deletions(-)

diff --git a/app/tests/controllers/TransactionControllerTest.php b/app/tests/controllers/TransactionControllerTest.php
index aa770dd2db..8d042eb81a 100644
--- a/app/tests/controllers/TransactionControllerTest.php
+++ b/app/tests/controllers/TransactionControllerTest.php
@@ -491,6 +491,68 @@ class TransactionControllerTest extends TestCase
         $this->assertRedirectedToRoute('transactions.create',['what' => 'transfer']);
     }
 
+    public function testShow() {
+        $journal = FactoryMuffin::create('TransactionJournal');
+
+        // mock transaction journal:
+        $tj = $this->mock('Firefly\Storage\TransactionJournal\TransactionJournalRepositoryInterface');
+        $tj->shouldReceive('find')->with($journal->id)->andReturn($journal);
+
+
+
+        // call
+        $this->call('GET', '/transaction/show/' . $journal->id);
+
+        // test
+        $this->assertResponseOk();
+    }
+
+    public function testShowError() {
+
+        // mock transaction journal:
+        $tj = $this->mock('Firefly\Storage\TransactionJournal\TransactionJournalRepositoryInterface');
+        $tj->shouldReceive('find')->with(1)->andReturn(null);
+
+        // call
+        $this->call('GET', '/transaction/show/1');
+
+        // test
+        $this->assertResponseOk();
+        $this->assertViewHas('message');
+    }
+
+    public function testEdit() {
+        $journal = FactoryMuffin::create('TransactionJournal');
+
+        // mock transaction journal:
+        $tj = $this->mock('Firefly\Storage\TransactionJournal\TransactionJournalRepositoryInterface');
+        $tj->shouldReceive('find')->with($journal->id)->andReturn($journal);
+
+        // mock account repository
+        $accounts = $this->mock('Firefly\Storage\Account\AccountRepositoryInterface');
+        $accounts->shouldReceive('getActiveDefaultAsSelectList')->andReturn([]);
+
+
+
+        // call
+        $this->call('GET', '/transaction/edit/' . $journal->id);
+
+        // test
+        $this->assertResponseOk();
+    }
+
+    public function testEditError() {
+        // mock transaction journal:
+        $tj = $this->mock('Firefly\Storage\TransactionJournal\TransactionJournalRepositoryInterface');
+        $tj->shouldReceive('find')->with(1)->andReturn(null);
+
+        // call
+        $this->call('GET', '/transaction/edit/1');
+
+        // test
+        $this->assertResponseOk();
+    }
+
     public function tearDown()
     {
         Mockery::close();
diff --git a/app/tests/models/AllModelsTest.php b/app/tests/models/AllModelsTest.php
index caf0bcf927..4fd3bb7232 100644
--- a/app/tests/models/AllModelsTest.php
+++ b/app/tests/models/AllModelsTest.php
@@ -85,6 +85,7 @@ class AllModelsTest extends TestCase
         $t1 = FactoryMuffin::create('Transaction');
         $t2 = FactoryMuffin::create('Transaction');
         $t3 = FactoryMuffin::create('Transaction');
+        $user = FactoryMuffin::create('User');
 
         $tj->transactions()->save($t1);
         $tj->transactions()->save($t2);
@@ -95,10 +96,13 @@ class AllModelsTest extends TestCase
 
         $tj->components()->save($budget);
         $tj->components()->save($category);
+        $user->transactionjournals()->save($tj);
 
         $this->assertCount(2, $tj->components()->get());
         $this->assertCount(1, $tj->budgets()->get());
         $this->assertCount(1, $tj->categories()->get());
+        $this->assertCount(1, $user->transactionjournals()->get());
+
 
         $this->assertCount(3, $tj->transactions()->get());
 
diff --git a/app/views/partials/menu/shared.blade.php b/app/views/partials/menu/shared.blade.php
index 329edfe592..e6d7777482 100644
--- a/app/views/partials/menu/shared.blade.php
+++ b/app/views/partials/menu/shared.blade.php
@@ -11,7 +11,7 @@
     </li>
 </ul>
 
-
+@if(\Auth::user() && \Auth::check())
 <ul class="nav navbar-nav navbar-right">
     <li @if($r=='preferences')class="active"@endif><a href="{{route('preferences')}}"><span class="glyphicon glyphicon-cog"></span> Preferences</a></li>
     <li class="dropdown">
@@ -22,4 +22,5 @@
             <li><a href="{{route('logout')}}"><span class="glyphicon glyphicon-arrow-right"></span> Logout</a></li>
         </ul>
     </li>
-</ul>
\ No newline at end of file
+</ul>
+@endif
\ No newline at end of file