Adjust tests, interfaces and traits related to stats / status

Author: sileence

resources/views/components/stats-badge.blade.php

@@ -1,8 +1,9 @@
 @props(['status', 'testsCount', 'passingTests', 'testsCount'])
+
 <span class="rounded-full text-xs text-{{ $status === 'passed' ? 'green' : ($status === 'warned' ? 'yellow' : 'red')  }}-800 bg-{{ $status === 'passed' ? 'green' : ($status === 'warned' ? 'yellow' : 'red')  }}-300 px-3 py-1 inline-flex">
     @if ($status === 'passed')
         {{ $testsCount }}
     @else
         {{ $passingTests }} / {{ $testsCount }}
     @endif
-</span>
+</span>

resources/views/dashboard/_module-panel.blade.php

@@ -1,7 +1,7 @@
 <div class="rounded-lg bg-white overflow-hidden">
     <div class="flex p-4 justify-between items-center w-full border-b border-gray-300 bg-gray-200">
         <span class="font-semibold text-lg text-gray-700">{{ $module->name }}</span>
-        <x-enlighten-stats-badge :status="$module->getStatus()" :tests-count="$module->getTestsCount()" :passing-tests="$module->getPassingTestsCount()"></x-enlighten-stats-badge>
+        <x-enlighten-stats-badge :model="$module"></x-enlighten-stats-badge>
     </div>
     <ul class="py-4">
         @foreach($module->groups as $group)

resources/views/dashboard/index.blade.php

@@ -22,7 +22,7 @@
                     </td>
                     <td class=" px-6 py-4 ">{{ $run->created_at->toDateTimeString() }}</td>
                     <td class=" px-6 py-4 ">
-                        <x-enlighten-stats-badge :status="$run->getStatus()" :tests-count="$run->getTestsCount()" :passing-tests="$run->getPassingTestsCount()"></x-enlighten-stats-badge>
+                        <x-enlighten-stats-badge :model="$run"></x-enlighten-stats-badge>
                     </td>
                     <td class=" px-6 py-4 ">
                         <a href="{{ route('enlighten.run.show', $run->id) }}" class="text-teal-500 hover:text-teal-600">View</a>

src/GetsStatsFromGroups.php

@@ -26,4 +26,14 @@ public function getStatus(): string
 
         return 'warned';
     }
-}
+
+    public function hasPassed(): bool
+    {
+        return $this->getStatus() === 'passed';
+    }
+
+    public function hasFailed(): bool
+    {
+        return $this->getStatus() === 'failed';
+    }
+}

src/Models/Run.php

@@ -4,8 +4,10 @@
 
 use Illuminate\Database\Eloquent\Model;
 use Styde\Enlighten\GetsStatsFromGroups;
+use Styde\Enlighten\Statable;
+use Styde\Enlighten\Statusable;
 
-class Run extends Model
+class Run extends Model implements Statable, Statusable
 {
     use GetsStatsFromGroups;
 
@@ -19,4 +21,14 @@ public function groups()
     {
         return $this->hasMany(ExampleGroup::class);
     }
+
+    public function hasPassed()
+    {
+        return $this->passed;
+    }
+
+    public function hasFailed()
+    {
+        return $this->failed;
+    }
 }

src/Module.php

@@ -4,7 +4,7 @@
 
 use Illuminate\Support\Collection;
 
-class Module
+class Module implements Statusable, Statable
 {
     use ReadsDynamicAttributes, GetsStatsFromGroups;
 
@@ -29,8 +29,13 @@ public function addGroups(Collection $groups): void
         $this->attributes['groups'] = $groups;
     }
 
-    public function getPassed(): bool
+    public function hasPassed()
     {
-        return $this->status === 'passed';
+        return $this->passed;
+    }
+
+    public function hasFailed()
+    {
+        return $this->failed;
     }
 }

src/Providers/EnlightenServiceProvider.php

@@ -16,6 +16,7 @@
 use Styde\Enlighten\TestRun;
 use Styde\Enlighten\View\Components\AppLayoutComponent;
 use Styde\Enlighten\View\Components\ResponseInfoComponent;
+use Styde\Enlighten\View\Components\StatsBadgeComponent;
 use Styde\Enlighten\View\Components\StatusBadgeComponent;
 
 class EnlightenServiceProvider extends ServiceProvider
@@ -103,6 +104,7 @@ private function registerViewComponents(): void
         $this->loadViewComponentsAs('enlighten', [
             'status-badge' => StatusBadgeComponent::class,
             'response-info' => ResponseInfoComponent::class,
+            'stats-badge' => StatsBadgeComponent::class,
             'html-response' => 'enlighten::components.html-response',
             'json-response' => 'enlighten::components.json-response',
             'key-value' => 'enlighten::components.key-value',
@@ -112,7 +114,6 @@ private function registerViewComponents(): void
             'request-info' => 'enlighten::components.request-info',
             'parameters-table' => 'enlighten::components.parameters-table',
             'request-input-table' => 'enlighten::components.request-input-table',
-            'stats-badge' => 'enlighten::components.stats-badge',
         ]);
     }
 

src/Statable.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace Styde\Enlighten;
+
+interface Statable extends Statusable
+{
+    public function getPassingTestsCount(): int;
+
+    public function getTestsCount(): int;
+}

src/View/Components/RepresentsStatusAsColor.php

@@ -0,0 +1,20 @@
+<?php
+
+
+namespace Styde\Enlighten\View\Components;
+
+use Styde\Enlighten\Statusable;
+
+trait RepresentsStatusAsColor
+{
+    protected function getColor(Statusable $model)
+    {
+        if ($model->hasPassed()) {
+            return 'green';
+        } elseif ($model->hasFailed()) {
+            return 'red';
+        } else {
+            return 'yellow';
+        }
+    }
+}

src/View/Components/StatsBadgeComponent.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace Styde\Enlighten\View\Components;
+
+use Illuminate\View\Component;
+use Styde\Enlighten\Statable;
+
+class StatsBadgeComponent extends Component
+{
+    use RepresentsStatusAsColor;
+
+    private Statable $model;
+
+    public function __construct(Statable $model)
+    {
+        $this->model = $model;
+    }
+
+    public function render()
+    {
+        return view('enlighten::components.stats-badge', [
+            'passingTests' => $this->model->getPassingTestsCount(),
+            'testsCount' => $this->model->getTestsCount(),
+            'status' => $this->model->getStatus(),
+            'color' => $this->getColor($this->model),
+        ]);
+    }
+}

src/View/Components/StatusBadgeComponent.php

@@ -7,6 +7,8 @@
 
 class StatusBadgeComponent extends Component
 {
+    use RepresentsStatusAsColor;
+
     public Statusable $model;
     public string $size;
 
@@ -19,18 +21,7 @@ public function __construct(Statusable $model, string $size = '8')
     public function render()
     {
         return view('enlighten::components.status-badge', [
-            'color' => $this->color(),
+            'color' => $this->getColor($this->model),
         ]);
     }
-
-    private function color()
-    {
-        if ($this->model->hasPassed()) {
-            return 'green';
-        } elseif ($this->model->hasFailed()) {
-            return 'red';
-        } else {
-            return 'yellow';
-        }
-    }
 }

tests/Unit/HasGroupsTest.php tests/Unit/GetsStatsFromGroupsTest.php

@@ -5,10 +5,10 @@
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Styde\Enlighten\GetsStatsFromGroups;
 use Styde\Enlighten\Models\ExampleGroup;
-use Styde\Enlighten\Module;
+use Styde\Enlighten\ReadsDynamicAttributes;
 use Tests\TestCase;
 
-class HasGroupsTest extends TestCase
+class GetsStatsFromGroupsTest extends TestCase
 {
     use RefreshDatabase;
 
@@ -23,10 +23,10 @@ public function get_the_stats_of_a_module(): void
         $this->createExample($group, 'third_test', 'passed');
         $this->createExample($group, 'fourth_test', 'passed');
 
-//        $module = new Module('All', ['*']);
-
         $module = new class {
             use GetsStatsFromGroups;
+
+            public $groups;
         };
 
         $module->groups = ExampleGroup::with('stats')->get();