Merge pull request #4824 from Laravel-Backpack/we-need-more-tests

more tests

Author: tabacitu

phpunit.xml

@@ -23,6 +23,7 @@
             <directory suffix=".php">./src/app/Models/Traits/</directory>
             <file>./src/app/Library/Widget.php</file>
             <file>./src/app/Http/Controllers/CrudController.php</file>
+            <file>./src/ViewNamespaces.php</file>
             <exclude>
                 <directory suffix=".php">./src/app/Models/Traits/SpatieTranslatable/</directory>
             </exclude>

src/BackpackServiceProvider.php

@@ -163,6 +163,11 @@ public function publishFiles()
      */
     public function setupRoutes(Router $router)
     {
+        if (app()->runningUnitTests()) {
+            $this->loadRoutesFrom(__DIR__.'/routes/backpack/testing.php');
+
+            return;
+        }
         // by default, use the routes file provided in vendor
         $routeFilePathInUse = __DIR__.$this->routeFilePath;
 

src/app/Http/Controllers/CrudController.php

@@ -33,7 +33,7 @@ public function __construct()
         // It's done inside a middleware closure in order to have
         // the complete request inside the CrudPanel object.
         $this->middleware(function ($request, $next) {
-            $this->crud = app()->make('crud');
+            $this->crud = app('crud');
 
             $this->crud->setRequest($request);
 
@@ -96,6 +96,7 @@ protected function setupDefaults()
     protected function setupConfigurationForCurrentOperation()
     {
         $operationName = $this->crud->getCurrentOperation();
+
         $setupClassName = 'setup'.Str::studly($operationName).'Operation';
 
         /*

src/app/Library/CrudPanel/CrudFilter.php

@@ -11,17 +11,29 @@
 class CrudFilter
 {
     public $name; // the name of the filtered variable (db column name)
+
     public $type = 'select2'; // the name of the filter view that will be loaded
+
     public $key; //camelCased version of filter name to use in internal ids, js functions and css classes.
+
     public $label;
+
     public $placeholder;
+
     public $values;
+
     public $options;
+
     public $logic;
+
     public $fallbackLogic;
+
     public $currentValue;
+
     public $view;
+
     public $viewNamespace = 'crud::filters';
+
     public $applied = false;
 
     public function __construct($options, $values, $logic, $fallbackLogic)
@@ -210,6 +222,8 @@ public function forget($attribute)
      * @param  string  $field  The name of the field.
      * @param  string  $attribute  The name of the attribute being removed.
      *
+     * @codeCoverageIgnore
+     *
      * @deprecated
      */
     public function removeFilterAttribute($filter, $attribute)
@@ -511,21 +525,21 @@ private function applyDefaultLogic($name, $operator, $input = null)
                 $this->crud()->addClause($operator);
                 break;
 
-            // TODO:
-            // whereBetween
-            // whereNotBetween
-            // whereIn
-            // whereNotIn
-            // whereNull
-            // whereNotNull
-            // whereDate
-            // whereMonth
-            // whereDay
-            // whereYear
-            // whereColumn
-            // like
-
-            // sql comparison operators
+                // TODO:
+                // whereBetween
+                // whereNotBetween
+                // whereIn
+                // whereNotIn
+                // whereNull
+                // whereNotNull
+                // whereDate
+                // whereMonth
+                // whereDay
+                // whereYear
+                // whereColumn
+                // like
+
+                // sql comparison operators
             case '=':
             case '<=>':
             case '<>':

src/app/Library/CrudPanel/CrudPanel.php

@@ -148,6 +148,7 @@ private function getSchema()
      * DEPRECATION NOTICE: This method is no longer used and will be removed in future versions of Backpack
      *
      * @deprecated
+     * @codeCoverageIgnore
      *
      * @return bool
      */
@@ -307,16 +308,18 @@ public function getFirstOfItsTypeInArray($type, $array)
         });
     }
 
-    // ------------
-    // TONE FUNCTIONS - UNDOCUMENTED, UNTESTED, SOME MAY BE USED IN THIS FILE
-    // ------------
-    //
-    // TODO:
-    // - figure out if they are really needed
-    // - comments inside the function to explain how they work
-    // - write docblock for them
-    // - place in the correct section above (CREATE, READ, UPDATE, DELETE, ACCESS, MANIPULATION)
-
+    /**
+     * TONE FUNCTIONS - UNDOCUMENTED, UNTESTED, SOME MAY BE USED IN THIS FILE.
+     *
+     * TODO:
+     * - figure out if they are really needed
+     * - comments inside the function to explain how they work
+     * - write docblock for them
+     * - place in the correct section above (CREATE, READ, UPDATE, DELETE, ACCESS, MANIPULATION)
+     *
+     * @deprecated
+     * @codeCoverageIgnore
+     */
     public function sync($type, $fields, $attributes)
     {
         if (! empty($this->{$type})) {

src/app/Library/CrudPanel/Traits/HasViewNamespaces.php

@@ -4,6 +4,9 @@
 
 use Backpack\CRUD\ViewNamespaces;
 
+/**
+ * @codeCoverageIgnore
+ */
 trait HasViewNamespaces
 {
     /**

src/app/Library/CrudPanel/Traits/SaveActions.php

@@ -212,7 +212,7 @@ public function orderSaveActions(array $saveActions)
     /**
      * Return the ordered save actions to use in the crud panel.
      *
-     * @return void
+     * @return array
      */
     public function getOrderedSaveActions()
     {
@@ -228,7 +228,7 @@ public function getOrderedSaveActions()
     /**
      * Returns the save actions that passed the visible callback.
      *
-     * @return void
+     * @return array
      */
     public function getVisibleSaveActions()
     {

src/routes/backpack/testing.php

@@ -0,0 +1,21 @@
+<?php
+
+use Illuminate\Support\Facades\Route;
+
+/*
+|--------------------------------------------------------------------------
+| Backpack Testing Routes
+|--------------------------------------------------------------------------
+| This routes are loaded only when running unit tests.
+|
+*/
+
+Route::group([
+    (array) config('backpack.base.web_middleware', 'web'),
+    (array) config('backpack.base.middleware_key', 'admin'),
+    'prefix'     => config('backpack.base.route_prefix', 'admin'),
+],
+    function () {
+        Route::crud('users', 'Backpack\CRUD\Tests\Unit\Http\Controllers\UserCrudController');
+    }
+);