Merge branch 'master' into develop

Author: mikebronner

tests/Unit/CachedBuilderTest.php

@@ -59,7 +59,7 @@ public function testCacheIsEmptyBeforeLoadingModels()
 
         $this->assertNull($results);
     }
-/** @group test */
+
     public function testCacheIsNotEmptyAfterLoadingModels()
     {
         (new Author)->with('books')->get();

tests/Unit/Traits/CachableTest.php

@@ -13,6 +13,7 @@
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\UncachedStore;
 use GeneaLabs\LaravelModelCaching\Tests\UnitTestCase;
 use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Database\Eloquent\Collection;
 
 class CachableTest extends UnitTestCase
 {
@@ -83,4 +84,22 @@ public function testSetCachePrefixAttribute()
 
         $this->assertNotNull($results);
     }
+
+    public function testAllReturnsCollection()
+    {
+        (new Author)->truncate();
+        factory(Author::class, 1)->create();
+        $authors = (new Author)->all();
+
+        $cachedResults = cache()
+            ->tags([
+                'genealabs:laravel-model-caching:genealabslaravelmodelcachingtestsfixturesauthor',
+            ])
+            ->get(sha1('genealabs:laravel-model-caching:genealabslaravelmodelcachingtestsfixturesauthor'))['value'];
+        $liveResults = (new UncachedAuthor)->all();
+
+        $this->assertInstanceOf(Collection::class, $authors);
+        $this->assertInstanceOf(Collection::class, $cachedResults);
+        $this->assertInstanceOf(Collection::class, $liveResults);
+    }
 }