Update implementation of ItemHistoryWidget

kontenta · Oct 3, 2018 · 45b06fc · 45b06fc
1 parent 3585a67
commit 45b06fc
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/resources/views/widgets/itemHistory.blade.php b/resources/views/widgets/itemHistory.blade.php
@@ -3,7 +3,7 @@
   <ul>
   @foreach($entries as $entry)
     <li lang="en" data-kontour-entry-action="{{ $entry['action'] }}"@if($entry['user']) data-kontour-username="{{ $entry['user']->getDisplayName() }}"@endif>
-        <span>{{ $entry['action'] }}</span>
+        <span>{{ ucfirst($entry['action']) }}</span>
         <time datetime="{{ $entry['datetime']->toDateTimeString() }}">{{ $entry['datetime']->diffForHumans() }}</time>
         @if($entry['user'])
             <span>by</span> <span>{{ $entry['user']->getDisplayName() }}</span>

diff --git a/src/Widgets/ItemHistoryWidget.php b/src/Widgets/ItemHistoryWidget.php
@@ -33,14 +33,14 @@ public function addEntry(string $action, \DateTime $datetime, AdminUser $user =
         return $this;
     }
 
-    public function addCreateEntry(\DateTime $datetime, AdminUser $user = null): ItemHistoryWidgetContract
+    public function addCreatedEntry(\DateTime $datetime, AdminUser $user = null): ItemHistoryWidgetContract
     {
-        return $this->addEntry('create', $datetime, $user);
+        return $this->addEntry('created', $datetime, $user);
     }
 
-    public function addUpdateEntry(\DateTime $datetime, AdminUser $user = null): ItemHistoryWidgetContract
+    public function addUpdatedEntry(\DateTime $datetime, AdminUser $user = null): ItemHistoryWidgetContract
     {
-        return $this->addEntry('update', $datetime, $user);
+        return $this->addEntry('updated', $datetime, $user);
     }
 
     public function isAuthorized(Authorizable $user = null): bool

diff --git a/tests/Feature/Fakes/UserlandController.php b/tests/Feature/Fakes/UserlandController.php
@@ -42,7 +42,8 @@ public function edit($id)
     {
         $widget = app(ItemHistoryWidget::class);
         $this->registerAdminWidget($widget);
-        $widget->addCreateEntry(new \DateTime(), Auth::guard(config('kontour.guard'))->user());
+        $widget->addCreatedEntry(new \DateTime(), Auth::guard(config('kontour.guard'))->user());
+        $widget->addUpdatedEntry(new \DateTime(), Auth::guard(config('kontour.guard'))->user());
 
         return view('userland::index');
     }

diff --git a/tests/Feature/UserlandControllerTest.php b/tests/Feature/UserlandControllerTest.php
@@ -86,6 +86,7 @@ public function test_item_history_widget()
     {
         $response = $this->actingAs($this->user)->get(route('userland.edit', 1));
         $response->assertSee('<section data-kontour-widget="itemHistory">');
-        $response->assertSee('<li lang="en" data-kontour-entry-action="create" data-kontour-username="'.$this->user->getDisplayName() .'">');
+        $response->assertSee('<li lang="en" data-kontour-entry-action="created" data-kontour-username="'.$this->user->getDisplayName() .'">');
+        $response->assertSee('<li lang="en" data-kontour-entry-action="updated" data-kontour-username="'.$this->user->getDisplayName() .'">');
     }
 }