[Tests] Remove hashids test dependency

lindyhopchris · lindyhopchris · commit 9898574b0eeb · 2022-01-21T17:51:18.000Z
Closes #160
diff --git a/composer.json b/composer.json
@@ -35,7 +35,6 @@
     },
     "require-dev": {
         "cloudcreativity/json-api-testing": "^4.0",
-        "laravel-json-api/hashids": "^1.1",
         "laravel-json-api/testing": "^1.1",
         "orchestra/testbench": "^6.23",
         "phpunit/phpunit": "^9.5.10"
diff --git a/tests/dummy/app/JsonApi/V1/Comments/CommentSchema.php b/tests/dummy/app/JsonApi/V1/Comments/CommentSchema.php
@@ -21,12 +21,12 @@
 
 use App\Models\Comment;
 use LaravelJsonApi\Eloquent\Fields\DateTime;
+use LaravelJsonApi\Eloquent\Fields\ID;
 use LaravelJsonApi\Eloquent\Fields\Relations\BelongsTo;
 use LaravelJsonApi\Eloquent\Fields\Str;
 use LaravelJsonApi\Eloquent\Filters\WhereIdIn;
 use LaravelJsonApi\Eloquent\Pagination\PagePagination;
 use LaravelJsonApi\Eloquent\Schema;
-use LaravelJsonApi\HashIds\HashId;
 
 class CommentSchema extends Schema
 {
@@ -44,7 +44,7 @@ class CommentSchema extends Schema
     public function fields(): array
     {
         return [
-            HashId::make()->alreadyHashed()->withLength(10),
+            ID::make(),
             Str::make('content'),
             DateTime::make('createdAt')->sortable()->readOnly(),
             BelongsTo::make('post'),
diff --git a/tests/dummy/app/JsonApi/V1/Posts/PostSchema.php b/tests/dummy/app/JsonApi/V1/Posts/PostSchema.php
@@ -21,6 +21,7 @@
 
 use App\Models\Post;
 use LaravelJsonApi\Eloquent\Fields\DateTime;
+use LaravelJsonApi\Eloquent\Fields\ID;
 use LaravelJsonApi\Eloquent\Fields\Relations\BelongsTo;
 use LaravelJsonApi\Eloquent\Fields\Relations\BelongsToMany;
 use LaravelJsonApi\Eloquent\Fields\Relations\HasMany;
@@ -35,7 +36,6 @@
 use LaravelJsonApi\Eloquent\Schema;
 use LaravelJsonApi\Eloquent\SoftDeletes;
 use LaravelJsonApi\Eloquent\Sorting\SortCountable;
-use LaravelJsonApi\HashIds\HashId;
 
 class PostSchema extends Schema
 {
@@ -67,7 +67,7 @@ class PostSchema extends Schema
     public function fields(): array
     {
         return [
-            HashId::make()->alreadyHashed()->withLength(10),
+            ID::make(),
             BelongsTo::make('author')->type('users')->readOnly(),
             HasMany::make('comments')->canCount()->readOnly(),
             Str::make('content'),
diff --git a/tests/dummy/app/JsonApi/V1/Tags/TagSchema.php b/tests/dummy/app/JsonApi/V1/Tags/TagSchema.php
@@ -21,12 +21,12 @@
 
 use App\Models\Tag;
 use LaravelJsonApi\Eloquent\Fields\DateTime;
+use LaravelJsonApi\Eloquent\Fields\ID;
 use LaravelJsonApi\Eloquent\Fields\Relations\BelongsToMany;
 use LaravelJsonApi\Eloquent\Fields\Str;
 use LaravelJsonApi\Eloquent\Filters\WhereIdIn;
 use LaravelJsonApi\Eloquent\Pagination\PagePagination;
 use LaravelJsonApi\Eloquent\Schema;
-use LaravelJsonApi\HashIds\HashId;
 
 class TagSchema extends Schema
 {
@@ -44,7 +44,7 @@ class TagSchema extends Schema
     public function fields(): array
     {
         return [
-            HashId::make()->alreadyHashed()->withLength(10),
+            ID::make(),
             DateTime::make('createdAt')->sortable()->readOnly(),
             Str::make('name')->sortable(),
             BelongsToMany::make('posts')
diff --git a/tests/dummy/app/JsonApi/V1/Users/UserSchema.php b/tests/dummy/app/JsonApi/V1/Users/UserSchema.php
@@ -21,12 +21,12 @@
 
 use App\Models\User;
 use LaravelJsonApi\Eloquent\Fields\DateTime;
+use LaravelJsonApi\Eloquent\Fields\ID;
 use LaravelJsonApi\Eloquent\Fields\Str;
 use LaravelJsonApi\Eloquent\Filters\Where;
 use LaravelJsonApi\Eloquent\Filters\WhereIdIn;
 use LaravelJsonApi\Eloquent\Pagination\PagePagination;
 use LaravelJsonApi\Eloquent\Schema;
-use LaravelJsonApi\HashIds\HashId;
 
 class UserSchema extends Schema
 {
@@ -44,7 +44,7 @@ class UserSchema extends Schema
     public function fields(): array
     {
         return [
-            HashId::make()->alreadyHashed()->withLength(10),
+            ID::make(),
             DateTime::make('createdAt')->readOnly(),
             Str::make('name'),
             DateTime::make('updatedAt')->readOnly(),
diff --git a/tests/dummy/app/Models/Comment.php b/tests/dummy/app/Models/Comment.php
@@ -25,9 +25,7 @@
 
 class Comment extends Model
 {
-
     use HasFactory;
-    use Concerns\HashRouteKey;
 
     /**
      * @var string[]
diff --git a/tests/dummy/app/Models/Concerns/HashRouteKey.php b/tests/dummy/app/Models/Concerns/HashRouteKey.php
diff --git a/tests/dummy/app/Models/Post.php b/tests/dummy/app/Models/Post.php
@@ -28,10 +28,8 @@
 
 class Post extends Model
 {
-
     use HasFactory;
     use SoftDeletes;
-    use Concerns\HashRouteKey;
 
     /**
      * @var string[]
diff --git a/tests/dummy/app/Models/Tag.php b/tests/dummy/app/Models/Tag.php
@@ -25,9 +25,7 @@
 
 class Tag extends Model
 {
-
     use HasFactory;
-    use Concerns\HashRouteKey;
 
     /**
      * @var string[]
diff --git a/tests/dummy/app/Models/User.php b/tests/dummy/app/Models/User.php
@@ -23,10 +23,8 @@
 
 class User extends Authenticatable
 {
-
     use HasFactory;
     use Notifiable;
-    use Concerns\HashRouteKey;
 
     /**
      * The attributes that are mass assignable.
diff --git a/tests/dummy/tests/Api/V1/Posts/AttachTagsTest.php b/tests/dummy/tests/Api/V1/Posts/AttachTagsTest.php
@@ -81,7 +81,7 @@ public function testInvalid(): void
         $data = [
             [
                 'type' => 'comments',
-                'id' => $comment->getRouteKey(),
+                'id' => (string) $comment->getRouteKey(),
             ],
         ];
 
@@ -147,7 +147,7 @@ public function testNotAcceptableMediaType(): void
         $data = [
             [
                 'type' => 'tags',
-                'id' => $tag->getRouteKey(),
+                'id' => (string) $tag->getRouteKey(),
             ],
         ];
 
diff --git a/tests/dummy/tests/Api/V1/Posts/CreateTest.php b/tests/dummy/tests/Api/V1/Posts/CreateTest.php
@@ -25,7 +25,6 @@
 use App\Models\Video;
 use App\Tests\Api\V1\TestCase;
 use LaravelJsonApi\Core\Document\ResourceObject;
-use Vinkla\Hashids\Facades\Hashids;
 
 class CreateTest extends TestCase
 {
@@ -67,8 +66,6 @@ public function test(): void
             ->assertCreatedWithServerId(url('/api/v1/posts'), $expected)
             ->id();
 
-        $id = Hashids::decode($id);
-
         $this->assertDatabaseHas('posts', [
             'author_id' => $post->author->getKey(),
             'content' => $data['content'],
diff --git a/tests/dummy/tests/Api/V1/Posts/DetachTagsTest.php b/tests/dummy/tests/Api/V1/Posts/DetachTagsTest.php
@@ -90,7 +90,7 @@ public function testInvalid(): void
         $data = [
             [
                 'type' => 'comments',
-                'id' => $comment->getRouteKey(),
+                'id' => (string) $comment->getRouteKey(),
             ],
         ];
 
@@ -150,7 +150,7 @@ public function testNotAcceptableMediaType(): void
         $data = [
             [
                 'type' => 'tags',
-                'id' => $tag->getRouteKey(),
+                'id' => (string) $tag->getRouteKey(),
             ],
         ];
 
diff --git a/tests/dummy/tests/Api/V1/Posts/IndexTest.php b/tests/dummy/tests/Api/V1/Posts/IndexTest.php
@@ -128,13 +128,13 @@ public function testIncludeAuthor(): void
         $expected1 = $this->serializer->post($posts[0])->jsonSerialize();
         $expected1['relationships']['author']['data'] = $user1 = [
             'type' => 'users',
-            'id' => $posts[0]->author->getRouteKey(),
+            'id' => (string) $posts[0]->author->getRouteKey(),
         ];
 
         $expected2 = $this->serializer->post($posts[1])->jsonSerialize();
         $expected2['relationships']['author']['data'] = $user2 = [
             'type' => 'users',
-            'id' => $posts[1]->author->getRouteKey(),
+            'id' => (string) $posts[1]->author->getRouteKey(),
         ];
 
         $response = $this
diff --git a/tests/dummy/tests/Api/V1/Posts/ReadAuthorIdentifierTest.php b/tests/dummy/tests/Api/V1/Posts/ReadAuthorIdentifierTest.php
@@ -56,7 +56,7 @@ public function test(): void
             ],
             'data' => [
                 'type' => 'users',
-                'id' => $this->post->author->getRouteKey(),
+                'id' => (string) $this->post->author->getRouteKey(),
             ],
             'jsonapi' => [
                 'version' => '1.0',
diff --git a/tests/dummy/tests/Api/V1/Posts/UpdateTagsTest.php b/tests/dummy/tests/Api/V1/Posts/UpdateTagsTest.php
@@ -100,7 +100,7 @@ public function testInvalid(): void
         $data = [
             [
                 'type' => 'comments',
-                'id' => $comment->getRouteKey(),
+                'id' => (string) $comment->getRouteKey(),
             ],
         ];
 
diff --git a/tests/dummy/tests/Api/V1/Posts/UpdateTest.php b/tests/dummy/tests/Api/V1/Posts/UpdateTest.php
@@ -286,7 +286,7 @@ private function serialize(): ResourceObject
 
         return ResourceObject::fromArray([
             'type' => 'posts',
-            'id' => $this->post->getRouteKey(),
+            'id' => (string) $this->post->getRouteKey(),
             'attributes' => [
                 'content' => $other->content,
                 'createdAt' => $this->post->created_at->toJSON(),
@@ -300,7 +300,7 @@ private function serialize(): ResourceObject
                 'author' => [
                     'data' => [
                         'type' => 'users',
-                        'id' => $this->post->author->getRouteKey(),
+                        'id' => (string) $this->post->author->getRouteKey(),
                     ],
                 ],
                 'tags' => [
diff --git a/tests/dummy/tests/Api/V1/Serializer.php b/tests/dummy/tests/Api/V1/Serializer.php
@@ -69,7 +69,7 @@ public function post(Post $post): ResourceObject
 
         return ResourceObject::fromArray([
             'type' => 'posts',
-            'id' => $id,
+            'id' => (string) $id,
             'attributes' => [
                 'content' => $post->content,
                 'createdAt' => optional($post->created_at)->jsonSerialize(),
@@ -127,7 +127,7 @@ public function tag(Tag $tag): ResourceObject
 
         return ResourceObject::fromArray([
             'type' => 'tags',
-            'id' => $id,
+            'id' => (string) $id,
             'attributes' => [
                 'createdAt' => $tag->created_at->jsonSerialize(),
                 'name' => $tag->name,
@@ -168,7 +168,7 @@ public function user(User $user): ResourceObject
 
         return ResourceObject::fromArray([
             'type' => 'users',
-            'id' => $id,
+            'id' => (string) $id,
             'attributes' => [
                 'createdAt' => $user->created_at->jsonSerialize(),
                 'name' => $user->name,
diff --git a/tests/dummy/tests/Api/V1/TestCase.php b/tests/dummy/tests/Api/V1/TestCase.php
@@ -53,7 +53,7 @@ protected function identifiersFor(string $type, $modelsOrResourceIds): array
             'type' => $type,
             'id' => ($modelOrResourceId instanceof UrlRoutable) ?
                 (string) $modelOrResourceId->getRouteKey() :
-                $modelOrResourceId
+                (string) $modelOrResourceId
         ])->values()->all();
     }
 }
diff --git a/tests/dummy/tests/TestCase.php b/tests/dummy/tests/TestCase.php
@@ -46,16 +46,6 @@ protected function setUp(): void
 
         /** Fix "now" so that updated at dates are predictable. */
         Date::setTestNow(CarbonImmutable::now()->startOfSecond());
-
-        config()->set('hashids', [
-            'default' => 'main',
-            'connections' => [
-                'main' => [
-                    'salt' => 'Z3wxm8m6fxPMRtjX',
-                    'length' => 10,
-                ],
-            ],
-        ]);
     }
 
     /**
@@ -78,7 +68,6 @@ protected function getPackageProviders($app)
             \LaravelJsonApi\Spec\ServiceProvider::class,
             \LaravelJsonApi\Validation\ServiceProvider::class,
             \LaravelJsonApi\Encoder\Neomerx\ServiceProvider::class,
-            \Vinkla\Hashids\HashidsServiceProvider::class,
             ServiceProvider::class,
             AppServiceProvider::class,
             AuthServiceProvider::class,
diff --git a/tests/lib/Acceptance/TestCase.php b/tests/lib/Acceptance/TestCase.php

Original file line number	Diff line number	Diff line change
`@@ -25,9 +25,7 @@`
`25`	`25`
`26`	`26`	`class Comment extends Model`
`27`	`27`	`{`
`28`		`-`
`29`	`28`	`use HasFactory;`
`30`		`- use Concerns\HashRouteKey;`
`31`	`29`
`32`	`30`	`/**`
`33`	`31`	`* @var string[]`
Original file line number	Diff line number	Diff line change
`@@ -28,10 +28,8 @@`
`28`	`28`
`29`	`29`	`class Post extends Model`
`30`	`30`	`{`
`31`		`-`
`32`	`31`	`use HasFactory;`
`33`	`32`	`use SoftDeletes;`
`34`		`- use Concerns\HashRouteKey;`
`35`	`33`
`36`	`34`	`/**`
`37`	`35`	`* @var string[]`
Original file line number	Diff line number	Diff line change
`@@ -23,10 +23,8 @@`
`23`	`23`
`24`	`24`	`class User extends Authenticatable`
`25`	`25`	`{`
`26`		`-`
`27`	`26`	`use HasFactory;`
`28`	`27`	`use Notifiable;`
`29`		`- use Concerns\HashRouteKey;`
`30`	`28`
`31`	`29`	`/**`
`32`	`30`	`* The attributes that are mass assignable.`