Merge branch 'master' into develop

Author: mikebronner

tests/Integration/CachedBuilderPaginationTest.php

@@ -0,0 +1,70 @@
+<?php namespace GeneaLabs\LaravelModelCaching\Tests\Integration;
+
+use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Author;
+use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Book;
+use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Profile;
+use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Publisher;
+use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Store;
+use GeneaLabs\LaravelModelCaching\Tests\Fixtures\UncachedAuthor;
+use GeneaLabs\LaravelModelCaching\Tests\Fixtures\UncachedBook;
+use GeneaLabs\LaravelModelCaching\Tests\Fixtures\UncachedProfile;
+use GeneaLabs\LaravelModelCaching\Tests\Fixtures\UncachedPublisher;
+use GeneaLabs\LaravelModelCaching\Tests\Fixtures\UncachedStore;
+use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Http\Resources\Author as AuthorResource;
+use GeneaLabs\LaravelModelCaching\Tests\IntegrationTestCase;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+
+/**
+* @SuppressWarnings(PHPMD.TooManyPublicMethods)
+* @SuppressWarnings(PHPMD.TooManyMethods)
+ */
+class CachedBuilderPaginationTest extends IntegrationTestCase
+{
+    use RefreshDatabase;
+
+    public function testPaginationIsCached()
+    {
+        $authors = (new Author)
+            ->paginate(3);
+
+        $key = sha1('genealabs:laravel-model-caching:genealabslaravelmodelcachingtestsfixturesauthor-paginate_by_3_page_1');
+        $tags = [
+            'genealabs:laravel-model-caching:genealabslaravelmodelcachingtestsfixturesauthor',
+        ];
+
+        $cachedResults = $this->cache()
+            ->tags($tags)
+            ->get($key)['value'];
+        $liveResults = (new UncachedAuthor)
+            ->paginate(3);
+
+        $this->assertEquals($cachedResults->toArray(), $authors->toArray());
+        $this->assertEquals($liveResults->toArray(), $authors->toArray());
+    }
+
+    public function testPaginationReturnsCorrectLinks()
+    {
+        $booksPage1 = (new Book)
+            ->paginate(2);
+        $booksPage2 = (new Book)
+            ->paginate(2, ['*'], null, 2);
+        $booksPage24 = (new Book)
+            ->paginate(2, ['*'], null, 24);
+
+        $this->assertCount(2, $booksPage1);
+        $this->assertCount(2, $booksPage2);
+        $this->assertCount(2, $booksPage24);
+        $this->assertContains(
+            '<li class="page-item active"><span class="page-link">1</span></li>',
+            (string) $booksPage1->links()
+        );
+        $this->assertContains(
+            '<li class="page-item active"><span class="page-link">2</span></li>',
+            (string) $booksPage2->links()
+        );
+        $this->assertContains(
+            '<li class="page-item active"><span class="page-link">24</span></li>',
+            (string) $booksPage24->links()
+        );
+    }
+}

tests/Integration/CachedBuilderTest.php

@@ -870,26 +870,6 @@ public function testFindOrFailCachesModels()
         $this->assertEquals($liveResults->toArray(), $author->toArray());
     }
 
-    public function testPaginationIsCached()
-    {
-        $authors = (new Author)
-            ->paginate(3);
-
-        $key = sha1('genealabs:laravel-model-caching:genealabslaravelmodelcachingtestsfixturesauthor-paginate_by_3_page_1');
-        $tags = [
-            'genealabs:laravel-model-caching:genealabslaravelmodelcachingtestsfixturesauthor',
-        ];
-
-        $cachedResults = $this->cache()
-            ->tags($tags)
-            ->get($key)['value'];
-        $liveResults = (new UncachedAuthor)
-            ->paginate(3);
-
-        $this->assertEquals($cachedResults->toArray(), $authors->toArray());
-        $this->assertEquals($liveResults->toArray(), $authors->toArray());
-    }
-
     public function testInsertInvalidatesCache()
     {
         $authors = (new Author)