Merge pull request #68 from joselfonseca/feature/improve-test-coverage

Improve testing coverage.

Author: joselfonseca

app/Exceptions/Handler.php

@@ -2,7 +2,6 @@
 
 namespace App\Exceptions;
 
-use Illuminate\Auth\AuthenticationException;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
 use Throwable;
 

app/Http/Controllers/Api/Assets/UploadFileController.php

@@ -188,10 +188,7 @@ protected function validateMime($mime)
      */
     protected function validateBodySize($contentLength, $content)
     {
-        if ($contentLength > config('files.maxsize', 1000000)) {
-            throw new BodyTooLargeException();
-        }
-        if (mb_strlen($content) > config('files.maxsize', 1000000)) {
+        if ($contentLength > config('files.maxsize', 1000000) || mb_strlen($content) > config('files.maxsize', 1000000)) {
             throw new BodyTooLargeException();
         }
     }

app/Http/Kernel.php

@@ -37,7 +37,7 @@ class Kernel extends HttpKernel
             \Illuminate\View\Middleware\ShareErrorsFromSession::class,
             \App\Http\Middleware\VerifyCsrfToken::class,
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
-        ]
+        ],
     ];
 
     /**

app/Http/Middleware/Authenticate.php

@@ -6,5 +6,4 @@
 
 class Authenticate extends Middleware
 {
-
 }

app/Http/Middleware/PreventRequestsDuringMaintenance.php

@@ -14,4 +14,4 @@ class PreventRequestsDuringMaintenance extends Middleware
     protected $except = [
         //
     ];
-}
+}

app/Http/Middleware/RedirectIfAuthenticated.php

@@ -9,7 +9,6 @@
 /**
  * @codeCoverageIgnore
  * Class RedirectIfAuthenticated
- * @package App\Http\Middleware
  */
 class RedirectIfAuthenticated
 {
@@ -33,4 +32,4 @@ public function handle($request, Closure $next, ...$guards)
 
         return $next($request);
     }
-}
+}

app/Providers/BroadcastServiceProvider.php

@@ -8,6 +8,7 @@
 class BroadcastServiceProvider extends ServiceProvider
 {
     /**
+     * @codeCoverageIgnore
      * Bootstrap any application services.
      *
      * @return void

app/Providers/ErrorHandlerServiceProvider.php

@@ -6,7 +6,6 @@
 use Dingo\Api\Exception\ResourceException;
 use Dingo\Api\Routing\Helpers;
 use Illuminate\Auth\AuthenticationException;
-use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Support\ServiceProvider;
 use Illuminate\Validation\ValidationException;
 
@@ -35,9 +34,6 @@ public function register()
         app('Dingo\Api\Exception\Handler')->register(function (AuthenticationException $exception) {
             return $this->response->errorUnauthorized('Unauthenticated.');
         });
-        app('Dingo\Api\Exception\Handler')->register(function (ModelNotFoundException $exception) {
-            return $this->response->errorNotFound('404 Not Found');
-        });
         app('Dingo\Api\Exception\Handler')->register(function (BodyTooLargeException $exception) {
             return $this->response->error('The body is too large', 413);
         });

tests/Feature/Assets/UploadImageTest.php

@@ -2,6 +2,7 @@
 
 namespace Tests\Feature\Assets;
 
+use Illuminate\Http\UploadedFile;
 use Tests\TestCase;
 use App\Entities\User;
 use Laravel\Passport\Passport;
@@ -153,4 +154,21 @@ function test_it_validates_url()
         $this->assertEquals(422, $response->getStatusCode());
         $this->assertArrayHasKey('Content-Type', $jsonResponse['errors']);
     }
+
+    function test_it_validates_size_using_multipart_file()
+    {
+        Storage::fake();
+        Passport::actingAs(
+            factory(User::class)->create()
+        );
+        config()->set('files.maxsize', 10);
+        $file = UploadedFile::fake()->image('avatar.jpg')->size(1000);
+        $response = $this->post('api/assets', [
+            'file' => $file
+        ]);
+        $jsonResponse = json_decode($response->getContent(), true);
+        $this->assertEquals(413, $response->getStatusCode());
+        $this->assertArrayHasKey('message', $jsonResponse);
+        $this->assertEquals('The body is too large', $jsonResponse['message']);
+    }
 }

tests/Feature/PingTest.php

@@ -23,4 +23,14 @@ public function test_it_returns_ping()
         $response->assertStatus(200);
         $response->assertJson(['status' => 'ok']);
     }
+
+    /**
+     *
+     */
+    public function test_it_returns_404()
+    {
+        $response = $this->json('GET', 'api/non-existing-resource');
+        $response->assertStatus(404);
+        $response->assertJson(['message' => '404 Not Found', 'status_code' => 404]);
+    }
 }