[Tests] Remove cursor paginator as test dependency

lindyhopchris · lindyhopchris · commit 5ec899e9b44b · 2023-02-09T18:06:55.000Z
diff --git a/composer.json b/composer.json
@@ -34,7 +34,6 @@
         "laravel/framework": "^8.76|^9.0"
     },
     "require-dev": {
-        "laravel-json-api/cursor-pagination": "^2.1",
         "laravel-json-api/testing": "^1.1.2",
         "orchestra/testbench": "^6.23|^7.0",
         "phpunit/phpunit": "^9.5.10"
diff --git a/tests/dummy/app/JsonApi/V1/Posts/PostSchema.php b/tests/dummy/app/JsonApi/V1/Posts/PostSchema.php
@@ -20,7 +20,6 @@
 namespace App\JsonApi\V1\Posts;
 
 use App\Models\Post;
-use LaravelJsonApi\CursorPagination\CursorPagination;
 use LaravelJsonApi\Eloquent\Fields\DateTime;
 use LaravelJsonApi\Eloquent\Fields\ID;
 use LaravelJsonApi\Eloquent\Fields\Relations\BelongsTo;
@@ -117,7 +116,11 @@ public function pagination(): MultiPagination
     {
         return new MultiPagination(
             PagePagination::make()->withoutNestedMeta(),
-            CursorPagination::make($this->id())->withoutNestedMeta(),
+            PagePagination::make()
+                ->withoutNestedMeta()
+                ->withSimplePagination()
+                ->withPageKey('current-page')
+                ->withPerPageKey('per-page')
         );
     }
 }
diff --git a/tests/dummy/tests/Api/V1/Posts/IndexTest.php b/tests/dummy/tests/Api/V1/Posts/IndexTest.php
@@ -119,50 +119,49 @@ public function testPagePagination(): void
         $response
             ->assertFetchedMany($expected)
             ->assertMeta($meta)
-            ->assertLinks($links);
+            ->assertExactLinks($links);
     }
 
-    public function testCursorPagination(): void
+    public function testMultiPagination(): void
     {
-        $posts = Post::factory()->count(5)->create([
+        $posts = Post::factory()->count(6)->create([
             'created_at' => fn() => fake()->dateTime(),
         ])->sortByDesc('created_at')->values();
 
-        $expected = $this->identifiersFor('posts', $posts->take(3));
+        $expected = $this->identifiersFor('posts', $posts->skip(2)->take(2));
 
         $meta = [
-            'from' => $expected[0]['id'],
-            'hasMore' => true,
-            'perPage' => 3,
-            'to' => $expected[2]['id'],
+            'currentPage' => 2,
+            'from' => 3,
+            'perPage' => 2,
+            'to' => 4,
         ];
 
         $links = [
             'first' => 'http://localhost/api/v1/posts?' . Arr::query([
-                    'page' => ['limit' => 3],
+                    'page' => ['current-page' => 1, 'per-page' => 2],
                     'sort' => '-createdAt',
                 ]),
             'next' => 'http://localhost/api/v1/posts?' . Arr::query([
-                    'page' => ['after' => $expected[2]['id'], 'limit' => 3],
+                    'page' => ['current-page' => 3, 'per-page' => 2],
                     'sort' => '-createdAt',
                 ]),
             'prev' => 'http://localhost/api/v1/posts?' . Arr::query([
-                    'page' => ['before' => $expected[0]['id'], 'limit' => 3],
+                    'page' => ['current-page' => 1, 'per-page' => 2],
                     'sort' => '-createdAt',
                 ]),
         ];
 
         $response = $this
-            ->withoutExceptionHandling()
             ->jsonApi()
             ->expects('posts')
-            ->page(['limit' => 3])
+            ->page(['current-page' => 2, 'per-page' => 2])
             ->get('/api/v1/posts');
 
         $response
             ->assertFetchedMany($expected)
             ->assertMeta($meta)
-            ->assertLinks($links);
+            ->assertExactLinks($links);
     }
 
     public function testIncludeAuthor(): void

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,6 @@`
`20`	`20`	`namespace App\JsonApi\V1\Posts;`
`21`	`21`
`22`	`22`	`use App\Models\Post;`
`23`		`-use LaravelJsonApi\CursorPagination\CursorPagination;`
`24`	`23`	`use LaravelJsonApi\Eloquent\Fields\DateTime;`
`25`	`24`	`use LaravelJsonApi\Eloquent\Fields\ID;`
`26`	`25`	`use LaravelJsonApi\Eloquent\Fields\Relations\BelongsTo;`
`@@ -117,7 +116,11 @@ public function pagination(): MultiPagination`
`117`	`116`	`{`
`118`	`117`	`return new MultiPagination(`
`119`	`118`	`PagePagination::make()->withoutNestedMeta(),`
`120`		`- CursorPagination::make($this->id())->withoutNestedMeta(),`
	`119`	`+ PagePagination::make()`
	`120`	`+ ->withoutNestedMeta()`
	`121`	`+ ->withSimplePagination()`
	`122`	`+ ->withPageKey('current-page')`
	`123`	`+ ->withPerPageKey('per-page')`
`121`	`124`	`);`
`122`	`125`	`}`
`123`	`126`	`}`