Update package tests and readme.

Define test routes in a RouteServiceProvider class.
Fix phpunit running tests without declaring specific class.

Author: achillesp

composer.lock

@@ -12,7 +12,7 @@
 >
     <testsuites>
         <testsuite name="Package Test Suite">
-            <directory suffix=".php">./tests/</directory>
+            <directory suffix="Test.php">./tests</directory>
         </testsuite>
     </testsuites>
     <filter>

phpunit.xml

@@ -11,22 +11,14 @@ The views are built using bootstrap (v3), but the styling can easily be override
 
 ## Installation
 
-### Step 1: Composer
+### Composer
 
 From the command line, run:
 
 ```
 composer require achillesp/laravel-crud-forms
 ```
 
-### Step 2: Service Provider (Laravel < 5.5)
-
-If using a Laravel version before 5.5, you will need to add the service provider to your app's `providers` array in `config/app.php`:
-
-```
-Achillesp\CrudForms\CrudFormsServiceProvider::class
-```
-
 ### Configuration
 
 This package uses a config file which you can override by publishing it to your app's config dir.
@@ -67,16 +59,16 @@ class PostController extends Controller
 }
 ``` 
 
-In the controller's constructor we define the properties which are handled by the controller.
-The available properties we can define are as follows.
+In the controller's constructor you can define the properties which are handled by the controller.
+The available properties that can be defined are as follows.
 
 ### The model
 
 This is the model, which should be passed in the constructor through Dependency Injection.
 
 ### The formFields array
 
-This is an array of all the fields you need in the forms. Each field is an array that has:
+This is an array of all the fields you need in the forms. Each field is declared as an array that has:
 1. `name`: This is the model's attribute name, as it is in the database.
 2. `label`: This is the field's label in the forms.
 3. `type`: The type of the form input field that will be used. Accepted types are: 
@@ -93,7 +85,7 @@ This is an array of all the fields you need in the forms. Each field is an array
     - radio
 4. `relationship`: This is needed in case of a select, select_multiple, radio or checkbox_multiple buttons. 
 You can state here the name of the relationship as it is defined in the model. 
-In the example above, the `Post` model has a `belongsTo` relationship to `category` and a `belongsToMany` relationship to `tags`.
+In the example bellow, the `Post` model has a `belongsTo` relationship to `category` and a `belongsToMany` relationship to `tags`.
 For `belongsTo` relationships you can use a select or a radio(group of radios) input.
 For `belongsToMany` relationships you can use a select_multiple or checkbox_multiple inputs. 
 5. `relFieldName`: This is optional. It is used only in case we have a relationship, to set the name of the attribute of the related model that is displayed (ie. in a select's options).
@@ -123,7 +115,8 @@ If not defined, then the first of the `formFields` is shown.
 
 ### The `formTitle` (optional)
 
-You can optionally, define the name of the model as we want it to appear in the views. If not defined, the name of the model will be used.
+You can optionally, define the name of the model as we want it to appear in the views. 
+If not defined, the name of the model will be used.
 
 ### The `bladeLayout` (optional)
 
@@ -149,12 +142,12 @@ These are the rules we want to use to validate data before saving the model.
 
 ```php
 $this->validationRules = [
-    'title'       => 'string|required|max:255',
-    'slug'        => 'string|required|max:100',
+    'title'       => 'required|max:255',
+    'slug'        => 'required|max:100',
     'body'        => 'required',
     'publish_on'  => 'date',
     'published'   => 'boolean',
-    'category_id' => 'int|required',
+    'category_id' => 'required|int',
 ];
 ```
 
@@ -185,7 +178,8 @@ The views are built with bootstrap v.3 and also have css classes to support some
 - datepicker class is used in date inputs
 - data-table class is used in the index view table
 
-It is also possible to publish the views, so you can change them anyway you need. To publish them, use the following artisan command:
+It is also possible to publish the views, so you can change them anyway you need. 
+To publish them, use the following artisan command:
 
 ```
 php artisan vendor:publish --provider=Achillesp\CrudForms\CrudFormsServiceProvider --tag=views

readme.md

@@ -4,7 +4,7 @@
 
 use Achillesp\CrudForms\Test\Models\Post;
 
-class CrudForms extends TestCase
+class CrudFormsTest extends TestCase
 {
     public function setUp()
     {
@@ -18,7 +18,7 @@ public function it_loads_all_resources_in_the_index()
         $response = $this->get('/post');
 
         $response->assertViewHas('entities', $posts)
-            ->assertSee($posts[0]->title);
+                    ->assertSee($posts[0]->title);
     }
 
     /** @test */
@@ -28,7 +28,7 @@ public function it_shows_a_single_resource()
         $response = $this->get('/post/1');
 
         $response->assertViewHas('entity', $post)
-            ->assertSee($post->title);
+                    ->assertSee($post->title);
     }
 
     /** @test */
@@ -38,8 +38,8 @@ public function it_loads_the_form_for_editing_resource()
         $response = $this->get('/post/1/edit');
 
         $response->assertViewHas('entity', $post)
-            ->assertSee('Submit Form')
-            ->assertSee($post->title);
+                    ->assertSee('Submit Form')
+                    ->assertSee($post->title);
     }
 
     /** @test */

tests/CrudForms.php renamed to tests/CrudFormsTest.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace Achillesp\CrudForms\Test\Providers;
+
+use Illuminate\Routing\Router;
+use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
+
+class RouteServiceProvider extends ServiceProvider
+{
+    /**
+     * This namespace is applied to your controller routes.
+     *
+     * In addition, it is set as the URL generator's root namespace.
+     *
+     * @var string
+     */
+    protected $namespace = 'Achillesp\CrudForms\Test\Controllers';
+
+    /**
+     * Define the routes for the application.
+     *
+     * @param  \Illuminate\Routing\Router  $router
+     * @return void
+     */
+    public function map(Router $router)
+    {
+        $router->group(['namespace' => $this->namespace], function ($router) {
+            $router->get('/', function () {
+                return 'home';
+            });
+
+            $router->group(['middleware' => 'web'], function($router) {
+                $router->resource('/post', 'PostController');
+
+                $router->put('/post/{post}/restore',
+                    [
+                        'as' => 'post.restore',
+                        'uses' => 'PostController@restore']);
+            });
+        });
+    }
+}

tests/Providers/RouteServiceProvider.php

@@ -2,13 +2,14 @@
 
 namespace Achillesp\CrudForms\Test;
 
-use Illuminate\Support\Facades\Route;
+use Carbon\Carbon;
 use Achillesp\CrudForms\Test\Models\Tag;
 use Achillesp\CrudForms\Test\Models\Post;
 use Achillesp\CrudForms\Test\Models\Category;
 use Illuminate\Database\Capsule\Manager as DB;
 use Achillesp\CrudForms\CrudFormsServiceProvider;
 use Orchestra\Testbench\TestCase as OrchestraTestCase;
+use Achillesp\CrudForms\Test\Providers\RouteServiceProvider;
 
 abstract class TestCase extends OrchestraTestCase
 {
@@ -36,6 +37,7 @@ protected function getPackageProviders($app)
     {
         return [
             CrudFormsServiceProvider::class,
+            RouteServiceProvider::class,
         ];
     }
 
@@ -48,27 +50,10 @@ protected function getPackageProviders($app)
     protected function getEnvironmentSetUp($app)
     {
         $this->app = $app;
-        $this->setRoutes();
         $app['config']->set('app.url', 'http://localhost');
         $app['config']->set('app.key', 'base64:WpZ7D2IUkBA+99f8HABIVujw2HqzR6kLGsTpDdV5nao=');
     }
 
-    /**
-     * Define the routes used in tests.
-     *
-     * @return void
-     */
-    protected function setRoutes()
-    {
-        Route::get('/', function () {
-            return 'home';
-        });
-
-        Route::resource('/post', 'Achillesp\CrudForms\Test\Controllers\PostController')->middleware('web');
-        Route::put('/post/{post}/restore',
-            ['as' => 'post.restore', 'uses' => 'Achillesp\CrudForms\Test\Controllers\PostController@restore'])->middleware('web');
-    }
-
     /**
      * Setup the test database.
      *
@@ -154,7 +139,7 @@ protected function seedTables()
                 'title'      => "post $i",
                 'slug'       => "post-$i",
                 'body'       => "post $i body",
-                'publish_on' => date_sub(now(), date_interval_create_from_date_string("$i days")),
+                'publish_on' => date_sub(Carbon::now(), date_interval_create_from_date_string("$i days")),
                 'published'  => rand(0, 1),
                 'category_id'=> $i,
             ]);