Improve test coverage part 1

Author: Jose Fonseca

app/Exceptions/Handler.php

@@ -41,6 +41,7 @@ public function report(Throwable $exception)
     /**
      * Render an exception into an HTTP response.
      *
+     * @codeCoverageIgnore
      * @param  \Illuminate\Http\Request $request
      * @param  \Exception $exception
      * @return \Illuminate\Http\Response
@@ -49,20 +50,4 @@ public function render($request, Throwable $exception)
     {
         return parent::render($request, $exception);
     }
-
-    /**
-     * Convert an authentication exception into an unauthenticated response.
-     *
-     * @param  \Illuminate\Http\Request $request
-     * @param  \Illuminate\Auth\AuthenticationException $exception
-     * @return \Illuminate\Http\Response
-     */
-    protected function unauthenticated($request, AuthenticationException $exception)
-    {
-        if ($request->expectsJson()) {
-            return response()->json(['message' => 'Unauthenticated.'], 401);
-        }
-
-        return redirect()->guest('login');
-    }
 }

app/Http/Kernel.php

@@ -14,11 +14,13 @@ class Kernel extends HttpKernel
      * @var array
      */
     protected $middleware = [
-        \App\Http\Middleware\CheckForMaintenanceMode::class,
+        // \App\Http\Middleware\TrustHosts::class,
+        \App\Http\Middleware\TrustProxies::class,
+        \Fruitcake\Cors\HandleCors::class,
+        \App\Http\Middleware\PreventRequestsDuringMaintenance::class,
         \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
         \App\Http\Middleware\TrimStrings::class,
         \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
-        \App\Http\Middleware\TrustProxies::class,
     ];
 
     /**
@@ -35,8 +37,7 @@ class Kernel extends HttpKernel
             \Illuminate\View\Middleware\ShareErrorsFromSession::class,
             \App\Http\Middleware\VerifyCsrfToken::class,
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
-            \Laravel\Passport\Http\Middleware\CreateFreshApiToken::class,
-        ],
+        ]
     ];
 
     /**
@@ -47,33 +48,16 @@ class Kernel extends HttpKernel
      * @var array
      */
     protected $routeMiddleware = [
-        'auth' => \Illuminate\Auth\Middleware\Authenticate::class,
+        'auth' => \App\Http\Middleware\Authenticate::class,
         'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
-        'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,
+        'cache.headers' => \Illuminate\Http\Middleware\SetCacheHeaders::class,
         'can' => \Illuminate\Auth\Middleware\Authorize::class,
         'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
         'password.confirm' => \Illuminate\Auth\Middleware\RequirePassword::class,
-        'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
         'role' => \Spatie\Permission\Middlewares\RoleMiddleware::class,
         'permission' => \Spatie\Permission\Middlewares\PermissionMiddleware::class,
         'signed' => \Illuminate\Routing\Middleware\ValidateSignature::class,
+        'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
         'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
     ];
-
-    /**
-     * The priority-sorted list of middleware.
-     *
-     * This forces non-global middleware to always be in the given order.
-     *
-     * @var array
-     */
-    protected $middlewarePriority = [
-        \Illuminate\Session\Middleware\StartSession::class,
-        \Illuminate\View\Middleware\ShareErrorsFromSession::class,
-        \App\Http\Middleware\Authenticate::class,
-        \Illuminate\Routing\Middleware\ThrottleRequests::class,
-        \Illuminate\Session\Middleware\AuthenticateSession::class,
-        \Illuminate\Routing\Middleware\SubstituteBindings::class,
-        \Illuminate\Auth\Middleware\Authorize::class,
-    ];
 }

app/Http/Middleware/Authenticate.php

@@ -6,16 +6,5 @@
 
 class Authenticate extends Middleware
 {
-    /**
-     * Get the path the user should be redirected to when they are not authenticated.
-     *
-     * @param  \Illuminate\Http\Request $request
-     * @return string
-     */
-    protected function redirectTo($request)
-    {
-        if (! $request->expectsJson()) {
-            return route('login');
-        }
-    }
+
 }

app/Http/Middleware/PreventRequestsDuringMaintenance.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Illuminate\Foundation\Http\Middleware\PreventRequestsDuringMaintenance as Middleware;
+
+class PreventRequestsDuringMaintenance extends Middleware
+{
+    /**
+     * The URIs that should be reachable while maintenance mode is enabled.
+     *
+     * @var array
+     */
+    protected $except = [
+        //
+    ];
+}

app/Http/Middleware/RedirectIfAuthenticated.php

@@ -2,25 +2,35 @@
 
 namespace App\Http\Middleware;
 
+use App\Providers\RouteServiceProvider;
 use Closure;
 use Illuminate\Support\Facades\Auth;
 
+/**
+ * @codeCoverageIgnore
+ * Class RedirectIfAuthenticated
+ * @package App\Http\Middleware
+ */
 class RedirectIfAuthenticated
 {
     /**
      * Handle an incoming request.
      *
-     * @param  \Illuminate\Http\Request $request
-     * @param  \Closure $next
-     * @param  string|null $guard
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Closure  $next
+     * @param  string|null  ...$guards
      * @return mixed
      */
-    public function handle($request, Closure $next, $guard = null)
+    public function handle($request, Closure $next, ...$guards)
     {
-        if (Auth::guard($guard)->check()) {
-            return redirect('/home');
+        $guards = empty($guards) ? [null] : $guards;
+
+        foreach ($guards as $guard) {
+            if (Auth::guard($guard)->check()) {
+                return redirect(RouteServiceProvider::HOME);
+            }
         }
 
         return $next($request);
     }
-}
+}

app/Providers/ErrorHandlerServiceProvider.php

@@ -42,11 +42,7 @@ public function register()
             return $this->response->error('The body is too large', 413);
         });
         app('Dingo\Api\Exception\Handler')->register(function (ValidationException $exception) {
-            if (request()->expectsJson()) {
-                throw new ResourceException('Validation Error', $exception->errors());
-            }
-
-            return redirect()->back()->withInput(request()->input())->withErrors($exception->errors());
+            throw new ResourceException('Validation Error', $exception->errors());
         });
     }
 }

app/Providers/RouteServiceProvider.php

@@ -8,61 +8,37 @@
 class RouteServiceProvider extends ServiceProvider
 {
     /**
-     * This namespace is applied to your controller routes.
+     * The path to the "home" route for your application.
      *
-     * In addition, it is set as the URL generator's root namespace.
+     * This is used by Laravel authentication to redirect users after login.
      *
      * @var string
      */
-    protected $namespace = 'App\Http\Controllers';
+    public const HOME = '/home';
 
     /**
-     * Define your route model bindings, pattern filters, etc.
-     *
-     * @return void
-     */
-    public function boot()
-    {
-        //
-
-        parent::boot();
-    }
-
-    /**
-     * Define the routes for the application.
-     *
-     * @return void
-     */
-    public function map()
-    {
-        $this->mapApiRoutes();
-
-        $this->mapWebRoutes();
-        //
-    }
-
-    /**
-     * Define the "web" routes for the application.
+     * The controller namespace for the application.
      *
-     * These routes all receive session state, CSRF protection, etc.
+     * When present, controller route declarations will automatically be prefixed with this namespace.
      *
-     * @return void
+     * @var string|null
      */
-    protected function mapWebRoutes()
-    {
-        Route::middleware('web')->namespace($this->namespace)->group(base_path('routes/web.php'));
-    }
+    // protected $namespace = 'App\\Http\\Controllers';
 
     /**
-     * Define the "api" routes for the application.
-     * Since we are using Dingo, the web middleware group will not apply.
-     *
-     * These routes are typically stateless.
+     * Define your route model bindings, pattern filters, etc.
      *
      * @return void
      */
-    protected function mapApiRoutes()
+    public function boot()
     {
-        require base_path('routes/api.php');
+        $this->routes(function () {
+            Route::namespace($this->namespace)
+                ->group(base_path('routes/api.php'));
+
+            Route::middleware('web')
+                ->namespace($this->namespace)
+                ->group(base_path('routes/web.php'));
+        });
     }
 }

routes/api.php

@@ -4,7 +4,7 @@
 
 $api->version('v1', function($api){
 
-    $api->group(['middleware' => ['throttle:60,1', 'bindings'], 'namespace' => 'App\Http\Controllers'], function($api) {
+    $api->group(['middleware' => ['throttle:60,1', \Illuminate\Routing\Middleware\SubstituteBindings::class], 'namespace' => 'App\Http\Controllers'], function($api) {
 
         $api->get('ping', 'Api\PingController@index');
 

tests/Feature/Console/InstallAppTest.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace Tests\Feature\Console;
+
+
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Tests\TestCase;
+
+class InstallAppTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_it_installs_app_with_command()
+    {
+        $this->artisan('app:install')
+            ->expectsQuestion('What is the Admininstrator\'s name?', 'Taylor')
+            ->expectsQuestion('What is the Admininstrator\'s email?', '[email protected]')
+            ->expectsQuestion('What is the Admininstrator\'s password?', '123456789');
+
+        $this->assertDatabaseHas('roles', [
+            'name' => 'Administrator'
+        ]);
+        $this->assertDatabaseHas('permissions', [
+            'name' => 'List users'
+        ]);
+        $this->assertDatabaseHas('permissions', [
+            'name' => 'Delete users'
+        ]);
+        $this->assertDatabaseHas('permissions', [
+            'name' => 'Update roles'
+        ]);
+        $this->assertDatabaseHas('permissions', [
+            'name' => 'List permissions'
+        ]);
+        $this->assertDatabaseHas('users', [
+            'name' => 'Taylor',
+            'email' => '[email protected]',
+        ]);
+    }
+}