Tests improvements

Author: d8vjork

Diff for: tests/JsonApiCollectionTest.php

@@ -3,7 +3,7 @@
 namespace SkoreLabs\JsonApi\Tests;
 
 use Illuminate\Support\Facades\Route;
-use SkoreLabs\JsonApi\Http\Resources\JsonApiCollection;
+use SkoreLabs\JsonApi\Support\JsonApi;
 use SkoreLabs\JsonApi\Testing\Assert;
 use SkoreLabs\JsonApi\Tests\Fixtures\Post;
 
@@ -18,8 +18,10 @@ protected function setUp(): void
     {
         parent::setUp();
 
+        $this->bypassPolicies();
+
         Route::get('/', function () {
-            return new JsonApiCollection(collect([
+            return JsonApi::format(collect([
                 new Post([
                     'id'       => 5,
                     'title'    => 'Test Title',
@@ -29,7 +31,7 @@ protected function setUp(): void
                     'id'    => 6,
                     'title' => 'Test Title 2',
                 ]),
-            ]), true);
+            ]));
         });
     }
 

Diff for: tests/JsonApiResourceTest.php

@@ -3,20 +3,22 @@
 namespace SkoreLabs\JsonApi\Tests;
 
 use Illuminate\Support\Facades\Route;
-use SkoreLabs\JsonApi\Http\Resources\JsonApiResource;
+use SkoreLabs\JsonApi\Support\JsonApi;
 use SkoreLabs\JsonApi\Testing\Assert;
 use SkoreLabs\JsonApi\Tests\Fixtures\Post;
 
 class JsonApiResourceTest extends TestCase
 {
     public function testResourcesMayBeConvertedToJsonApi()
     {
+        $this->bypassPolicies();
+        
         Route::get('/', function () {
-            return new JsonApiResource(new Post([
+            return JsonApi::format(new Post([
                 'id'       => 5,
                 'title'    => 'Test Title',
                 'abstract' => 'Test abstract',
-            ]), true);
+            ]));
         });
 
         $response = $this->get('/', ['Accept' => 'application/json']);
@@ -37,12 +39,14 @@ public function testResourcesMayBeConvertedToJsonApi()
 
     public function testResourcesHasIdentifier()
     {
+        $this->bypassPolicies();
+        
         Route::get('/', function () {
-            return new JsonApiResource(new Post([
+            return JsonApi::format(new Post([
                 'id'       => 5,
                 'title'    => 'Test Title',
                 'abstract' => 'Test abstract',
-            ]), true);
+            ]));
         });
 
         $this->get('/', ['Accept' => 'application/json'])->assertJsonApi(function (Assert $json) {
@@ -52,12 +56,14 @@ public function testResourcesHasIdentifier()
 
     public function testResourcesHasAttribute()
     {
+        $this->bypassPolicies();
+        
         Route::get('/', function () {
-            return new JsonApiResource(new Post([
+            return JsonApi::format(new Post([
                 'id'       => 5,
                 'title'    => 'Test Title',
                 'abstract' => 'Test abstract',
-            ]), true);
+            ]));
         });
 
         $this->get('/', ['Accept' => 'application/json'])->assertJsonApi(function (Assert $json) {
@@ -67,12 +73,14 @@ public function testResourcesHasAttribute()
 
     public function testResourcesHasAttributes()
     {
+        $this->bypassPolicies();
+        
         Route::get('/', function () {
-            return new JsonApiResource(new Post([
+            return JsonApi::format(new Post([
                 'id'       => 5,
                 'title'    => 'Test Title',
                 'abstract' => 'Test abstract',
-            ]), true);
+            ]));
         });
 
         $this->get('/', ['Accept' => 'application/json'])->assertJsonApi(function (Assert $json) {
@@ -86,7 +94,7 @@ public function testResourcesHasAttributes()
     // FIXME: Not available in Laravel 6, wait to support removal
     // public function testResourcesMayBeConvertedToJsonApiWithToJsonMethod()
     // {
-    //     $resource = new JsonApiResource(new Post([
+    //     $resource = JsonApi::format(new Post([
     //         'id'       => 5,
     //         'title'    => 'Test Title',
     //         'abstract' => 'Test abstract',
@@ -97,6 +105,8 @@ public function testResourcesHasAttributes()
 
     public function testResourcesWithRelationshipsMayBeConvertedToJsonApi()
     {
+        $this->bypassPolicies();
+        
         Route::get('/', function () {
             $post = new Post([
                 'id'       => 5,
@@ -109,7 +119,7 @@ public function testResourcesWithRelationshipsMayBeConvertedToJsonApi()
                 'title' => 'Test Parent Title',
             ]));
 
-            return new JsonApiResource($post, true);
+            return JsonApi::format($post);
         });
 
         $response = $this->get('/', ['Accept' => 'application/json']);
@@ -147,6 +157,8 @@ public function testResourcesWithRelationshipsMayBeConvertedToJsonApi()
 
     public function testResourcesHasRelationshipWith()
     {
+        $this->bypassPolicies();
+        
         Route::get('/', function () {
             $post = new Post([
                 'id'       => 5,
@@ -159,7 +171,7 @@ public function testResourcesHasRelationshipWith()
                 'title' => 'Test Parent Title',
             ]));
 
-            return new JsonApiResource($post, true);
+            return JsonApi::format($post);
         });
 
         $this->get('/', ['Accept' => 'application/json'])->assertJsonApi(function (Assert $json) {
@@ -172,6 +184,8 @@ public function testResourcesHasRelationshipWith()
 
     public function testResourcesAtRelationHasAttribute()
     {
+        $this->bypassPolicies();
+        
         Route::get('/', function () {
             $post = new Post([
                 'id'       => 5,
@@ -184,7 +198,7 @@ public function testResourcesAtRelationHasAttribute()
                 'title' => 'Test Parent Title',
             ]));
 
-            return new JsonApiResource($post, true);
+            return JsonApi::format($post);
         });
 
         $this->get('/', ['Accept' => 'application/json'])->assertJsonApi(function (Assert $json) {
@@ -198,7 +212,7 @@ public function testResourcesAtRelationHasAttribute()
     public function testResourcesMayNotBeConvertedToJsonApiWithoutPermissions()
     {
         Route::get('/', function () {
-            return new JsonApiResource(new Post([
+            return JsonApi::format(new Post([
                 'id'    => 5,
                 'title' => 'Test Title',
             ]));

Diff for: tests/TestCase.php

@@ -13,4 +13,16 @@ protected function getPackageProviders($app)
             JsonApiServiceProvider::class,
         ];
     }
+
+    protected function bypassPolicies()
+    {
+        config([
+            'json-api.authorisable' => [
+                'view' => true,
+                'viewAny' => true
+            ]
+        ]);
+
+        return $this;
+    }
 }