Merge pull request #4821 from Laravel-Backpack/add-even-more-tests-and-fix-color

Add more tests, attempt to fix coverage color

Author: tabacitu

.github/workflows/coverage.yml

@@ -50,9 +50,9 @@ jobs:
           status: ${{ steps.test-coverage.outputs.coverage-rounded-display }}
           path: ./test-coverage.svg
           color: ${{ steps.test-coverage.outputs.coverage > 90 && 'green'              ||
-            steps.test-coverage.outputs.coverage > 80 && 'yellow,green'       ||
-            steps.test-coverage.outputs.coverage > 70 && 'yellow'             ||
-            steps.test-coverage.outputs.coverage > 60 && 'orange,yellow'      ||
+            steps.test-coverage.outputs.coverage > 80 && 'yellow,green, green'       ||
+            steps.test-coverage.outputs.coverage > 70 && 'yellow, green'             ||
+            steps.test-coverage.outputs.coverage > 60 && 'yellow,yellow, green'      ||
             steps.test-coverage.outputs.coverage > 50 && 'orange'             ||
             steps.test-coverage.outputs.coverage > 40 && 'red,orange'         ||
             steps.test-coverage.outputs.coverage > 30 && 'red,red,orange'     ||

src/app/Library/CrudPanel/CrudButton.php

@@ -405,6 +405,8 @@ public function crud()
      * Dump the current object to the screen,
      * so that the developer can see its contents.
      *
+     * @codeCoverageIgnore
+     *
      * @return CrudButton
      */
     public function dump()
@@ -419,6 +421,8 @@ public function dump()
      * so that the developer can see its contents, then stops
      * the execution.
      *
+     * @codeCoverageIgnore
+     *
      * @return CrudButton
      */
     public function dd()

src/app/Library/CrudPanel/CrudColumn.php

@@ -80,14 +80,14 @@ public function key(string $key)
         }
 
         $columns = $this->crud()->columns();
+
         $searchKey = $this->attributes['key'];
         $column = $this->attributes;
 
         if (isset($columns[$searchKey])) {
             unset($columns[$searchKey]);
             $column['key'] = $key;
         }
-
         $this->attributes = $column;
         $this->setOperationSetting('columns', array_merge($columns, [$key => $column]));
 
@@ -179,6 +179,8 @@ public function makeLast()
      * Dump the current object to the screen,
      * so that the developer can see its contents.
      *
+     * @codeCoverageIgnore
+     *
      * @return CrudColumn
      */
     public function dump()
@@ -193,6 +195,8 @@ public function dump()
      * so that the developer can see its contents, then stops
      * the execution.
      *
+     * @codeCoverageIgnore
+     *
      * @return CrudColumn
      */
     public function dd()

src/app/Library/CrudPanel/CrudField.php

@@ -386,6 +386,8 @@ private function save()
      * Dump the current object to the screen,
      * so that the developer can see its contents.
      *
+     * @codeCoverageIgnore
+     *
      * @return CrudField
      */
     public function dump()
@@ -400,6 +402,8 @@ public function dump()
      * so that the developer can see its contents, then stops
      * the execution.
      *
+     * @codeCoverageIgnore
+     *
      * @return CrudField
      */
     public function dd()

src/app/Library/CrudPanel/CrudFilter.php

@@ -551,6 +551,8 @@ private function applyDefaultLogic($name, $operator, $input = null)
      * Dump the current object to the screen,
      * so that the developer can see its contents.
      *
+     * @codeCoverageIgnore
+     *
      * @return CrudFilter
      */
     public function dump()
@@ -565,6 +567,8 @@ public function dump()
      * so that the developer can see its contents, then stops
      * the execution.
      *
+     * @codeCoverageIgnore
+     *
      * @return CrudFilter
      */
     public function dd()

src/app/Library/CrudPanel/CrudPanelFacade.php

@@ -10,6 +10,7 @@
  * service container as 'crud'.
  */
 /**
+ * @codeCoverageIgnore
  * Class CrudPanelFacade.
  *
  * @method static setModel($model)

tests/Unit/CrudPanel/CrudPanelButtonsTest.php

@@ -6,14 +6,18 @@
 
 /**
  * @covers Backpack\CRUD\app\Library\CrudPanel\Traits\Buttons
+ * @covers Backpack\CRUD\app\Library\CrudPanel\CrudButton
  */
 class CrudPanelButtonsTest extends BaseCrudPanelTest
 {
     private $defaultButtonNames = [];
 
     private $topViewButton;
+
     private $lineViewButton;
+
     private $bottomViewButton;
+
     private $topModelFunctionButton;
 
     protected function setUp(): void

tests/Unit/CrudPanel/CrudPanelColumnsTest.php

@@ -2,11 +2,13 @@
 
 namespace Backpack\CRUD\Tests\Unit\CrudPanel;
 
+use Backpack\CRUD\app\Library\CrudPanel\CrudColumn;
 use Backpack\CRUD\Tests\Unit\Models\User;
 
 /**
  * @covers Backpack\CRUD\app\Library\CrudPanel\Traits\Columns
  * @covers Backpack\CRUD\app\Library\CrudPanel\Traits\ColumnsProtectedMethods
+ * @covers Backpack\CRUD\app\Library\CrudPanel\CrudColumn
  */
 class CrudPanelColumnsTest extends BaseDBCrudPanelTest
 {
@@ -532,4 +534,79 @@ public function testOrderColumnsMixedList()
 
         $this->assertEquals(['column2', 'column1', 'column3'], array_keys($this->crudPanel->columns()));
     }
+
+    public function testItCanAddAFluentColumn()
+    {
+        $this->crudPanel->setModel(User::class);
+
+        $this->crudPanel->column('my_column')->label('my_column');
+
+        $this->assertCount(1, $this->crudPanel->columns());
+
+        $this->assertEquals([
+            'name'               => 'my_column',
+            'type' => 'text',
+            'label' => 'my_column',
+            'key' => 'my_column',
+            'priority' => 0,
+            'tableColumn' => false,
+            'orderable' => false,
+            'searchLogic' => false,
+        ], $this->crudPanel->columns()['my_column']);
+    }
+
+    public function testItCanMakeAColumnFirstFluently()
+    {
+        $this->crudPanel->column('test1');
+        $this->crudPanel->column('test2')->makeFirst();
+        $crudColumns = $this->crudPanel->columns();
+        $firstColumn = reset($crudColumns);
+        $this->assertEquals($firstColumn['name'], 'test2');
+    }
+
+    public function testItCanMakeAColumnLastFluently()
+    {
+        $this->crudPanel->column('test1');
+        $this->crudPanel->column('test2');
+        $this->crudPanel->column('test1')->makeLast();
+        $crudColumns = $this->crudPanel->columns();
+        $firstColumn = reset($crudColumns);
+        $this->assertEquals($firstColumn['name'], 'test2');
+    }
+
+    public function testItCanPlaceColumnsFluently()
+    {
+        $this->crudPanel->column('test1');
+        $this->crudPanel->column('test2');
+        $this->crudPanel->column('test3')->after('test1');
+
+        $crudColumnsNames = array_column($this->crudPanel->columns(), 'name');
+        $this->assertEquals($crudColumnsNames, ['test1', 'test3', 'test2']);
+
+        $this->crudPanel->column('test4')->before('test1');
+        $crudColumnsNames = array_column($this->crudPanel->columns(), 'name');
+        $this->assertEquals($crudColumnsNames, ['test4', 'test1', 'test3', 'test2']);
+    }
+
+    public function testItCanRemoveColumnAttributesFluently()
+    {
+        $this->crudPanel->column('test1')->type('test');
+        $this->assertEquals($this->crudPanel->columns()['test1']['type'], 'test');
+        $this->crudPanel->column('test1')->forget('type');
+        $this->assertNull($this->crudPanel->columns()['test1']['type'] ?? null);
+    }
+
+    public function testItCanRemoveColumnFluently()
+    {
+        $this->crudPanel->column('test1')->type('test');
+        $this->assertCount(1, $this->crudPanel->columns());
+        $this->crudPanel->column('test1')->remove();
+        $this->assertCount(0, $this->crudPanel->columns());
+    }
+
+    public function testItCanAddAColumnToCrudFromClass()
+    {
+        CrudColumn::name('test');
+        $this->assertCount(1, $this->crudPanel->columns());
+    }
 }