Merge branch 'feature/add-browserkit-testing' into develop

mikebronner · mikebronner · commit f5a403b8e4b9 · 2018-03-03T15:01:37.000-08:00
diff --git a/composer.json b/composer.json
@@ -23,6 +23,7 @@
         "mockery/mockery": "0.9.*",
         "orchestra/database": "3.6.x-dev@dev",
         "orchestra/testbench": "^3.6",
+        "orchestra/testbench-browser-kit": "^3.6",
         "php-coveralls/php-coveralls" : "*",
         "phpmd/phpmd": "*",
         "phpunit/phpunit": "*",
diff --git a/phpunit.xml b/phpunit.xml
@@ -13,6 +13,9 @@
     syntaxCheck="false"
 >
 <testsuites>
+    <testsuite name="Feature">
+        <directory suffix="Test.php">./tests/Feature</directory>
+    </testsuite>
     <testsuite name="Integration">
         <directory suffix="Test.php">./tests/Integration</directory>
     </testsuite>
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/CreatesApplication.php b/tests/CreatesApplication.php
@@ -12,12 +12,26 @@ trait CreatesApplication
 {
     protected $cache;
 
+    protected function cache()
+    {
+        $cache = cache();
+
+        if (config('laravel-model-caching.store')) {
+            $cache = $cache->store(config('laravel-model-caching.store'));
+        }
+
+        return $cache;
+    }
+
     public function setUp()
     {
         parent::setUp();
 
+        require(__DIR__ . '/routes/web.php');
+
         $this->withFactories(__DIR__ . '/database/factories');
         $this->loadMigrationsFrom(__DIR__ . '/database/migrations');
+        view()->addLocation(__DIR__ . '/resources/views', 'laravel-model-caching');
 
         $this->cache = cache()
             ->store(config('laravel-model-caching.store'));
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/FeatureTestCase.php b/tests/FeatureTestCase.php
@@ -0,0 +1,8 @@
+<?php namespace GeneaLabs\LaravelModelCaching\Tests;
+
+use Orchestra\Testbench\BrowserKit\TestCase as BaseTestCase;
+
+abstract class FeatureTestCase extends BaseTestCase
+{
+    use CreatesApplication;
+}
diff --git a/tests/IntegrationTestCase.php b/tests/IntegrationTestCase.php
@@ -5,15 +5,4 @@
 abstract class IntegrationTestCase extends BaseTestCase
 {
     use CreatesApplication;
-
-    protected function cache()
-    {
-        $cache = cache();
-
-        if (config('laravel-model-caching.store')) {
-            $cache = $cache->store(config('laravel-model-caching.store'));
-        }
-
-        return $cache;
-    }
 }
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);`