Test pagination links using browserkit

mikebronner · mikebronner · commit 7acad69b7e1a · 2018-03-03T15:01:07.000-08:00
diff --git a/src/CachedBuilder.php b/src/CachedBuilder.php
@@ -115,7 +115,7 @@ public function paginate(
             return parent::paginate($perPage, $columns, $pageName, $page);
         }
 
-        $page = $page ?: 1;
+        $page = request("page", $page ?: 1);
         $cacheKey = $this->makeCacheKey($columns, null, "-paginate_by_{$perPage}_{$pageName}_{$page}");
 
         return $this->cachedValue(func_get_args(), $cacheKey);
diff --git a/tests/Feature/PaginationTest.php b/tests/Feature/PaginationTest.php
@@ -0,0 +1,23 @@
+<?php namespace GeneaLabs\LaravelModelCaching\Tests\Browser;
+
+use GeneaLabs\LaravelModelCaching\Tests\FeatureTestCase;
+use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Book;
+
+class PaginationTest extends FeatureTestCase
+{
+    public function testPaginationProvidesDifferentLinksOnDifferentPages()
+    {
+        $book = (new Book)
+            ->take(11)
+            ->get()
+            ->last();
+        $page1 = $this->visit("pagination-test");
+
+        $this->assertTrue(str_contains($page1->response->getContent(), '<li class="page-item active"><span class="page-link">1</span></li>'));
+
+        $page2 = $page1->click("2");
+
+        $this->assertTrue(str_contains($page2->response->getContent(), '<li class="page-item active"><span class="page-link">2</span></li>'));
+        $page2->see($book->title);
+    }
+}
diff --git a/tests/resources/views/model-caching-tests/pagination.blade.php b/tests/resources/views/model-caching-tests/pagination.blade.php
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html>
+    <body>
+        <table>
+
+            @foreach ($books as $book)
+                <tr>
+                    <td>
+                        {{ $book->id }}
+                    </td>
+                    <td>
+                        {{ $book->title }}
+                    </td>
+                </tr>
+            @endforeach
+
+        </table>
+
+        {{ $books->links() }}
+
+    </body>
+</html>
diff --git a/tests/routes/web.php b/tests/routes/web.php
@@ -0,0 +1,13 @@
+<?php
+
+use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Book;
+
+Route::get('pagination-test', function () {
+    $books = (new Book)
+        ->paginate(10);
+
+    return view("model-caching-tests.pagination")
+        ->with(compact(
+            'books'
+        ));
+});

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ public function paginate(`
`115`	`115`	`return parent::paginate($perPage, $columns, $pageName, $page);`
`116`	`116`	`}`
`117`	`117`
`118`		`- $page = $page ?: 1;`
	`118`	`+ $page = request("page", $page ?: 1);`
`119`	`119`	`$cacheKey = $this->makeCacheKey($columns, null, "-paginate_by_{$perPage}_{$pageName}_{$page}");`
`120`	`120`
`121`	`121`	`return $this->cachedValue(func_get_args(), $cacheKey);`