Merge pull request #20 from kontenta/fix/adminUser

Fix AdminUser
kontenta · Oct 5, 2018 · 31b968c · 31b968c
2 parents aedea9b + 0d86614
commit 31b968c
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 9 deletions.
diff --git a/resources/views/widgets/userAccount.blade.php b/resources/views/widgets/userAccount.blade.php
@@ -1,5 +1,5 @@
 <section data-kontour-widget="userAccount">
-  <span>{{ $user->getDisplayName() }}</span>
+  @if($user instanceof \Kontenta\Kontour\Contracts\AdminUser)<span>{{ $user->getDisplayName() }}</span>@endif
   <form action="{{ route('kontour.logout') }}" method="post">
     {{ csrf_field() }}
     <button type="submit">Logout</button>

diff --git a/tests/Feature/AuthenticationTest.php b/tests/Feature/AuthenticationTest.php
@@ -74,6 +74,24 @@ public function test_index_route() {
         $response->assertSuccessful();
     }
 
+    public function test_admin_user_account_widget()
+    {
+        $routeManager = $this->app->make(\Kontenta\Kontour\Contracts\AdminRouteManager::class);
+        $response = $this->actingAs($this->user)->get($routeManager->indexUrl());
+        $response->assertSee('<section data-kontour-widget="userAccount">');
+        $response->assertSee($this->user->getDisplayName());
+        $response->assertSee('<button type="submit">Logout</button>');
+    }
+
+    public function test_user_account_widget()
+    {
+        $routeManager = $this->app->make(\Kontenta\Kontour\Contracts\AdminRouteManager::class);
+        $user = new \Illuminate\Foundation\Auth\User();
+        $response = $this->actingAs($user)->get($routeManager->indexUrl());
+        $response->assertSee('<section data-kontour-widget="userAccount">');
+        $response->assertSee('<button type="submit">Logout</button>');
+    }
+
     public function test_logout()
     {
         /**

diff --git a/tests/Feature/UserlandControllerTest.php b/tests/Feature/UserlandControllerTest.php
@@ -51,14 +51,6 @@ public function test_menu_widget()
         $response->assertSee('<a href="' . route('userland.index') . '">Userland Tool</a>');
     }
 
-    public function test_user_account_widget()
-    {
-        $response = $this->actingAs($this->user)->get(route('userland.index'));
-        $response->assertSee('<section data-kontour-widget="userAccount">');
-        $response->assertSee($this->user->getDisplayName());
-        $response->assertSee('<button type="submit">Logout</button>');
-    }
-
     public function test_recent_visits_widgets()
     {
         $otherUser = factory(User::class)->create();