Add and improve unit tests

Author: mikebronner

src/Builder.php

@@ -15,27 +15,31 @@ protected function eagerLoadRelation(array $models, $name, Closure $constraints)
         $relation->addEagerConstraints($models);
         $constraints($relation);
 
-        return $relation->match(
-            $relation->initRelation($models, $name),
-            $this->cacheResults($relation, $models),
-            $name
-        );
+        return $this->cacheResults($relation, $models, $name);
     }
 
-    protected function cacheResults(Relation $relation, array $models) : Collection
+    protected function cacheResults(Relation $relation, array $models, string $name) : array
     {
         $parentIds = implode('_', collect($models)->pluck('id')->toArray());
         $parentName = str_slug(get_class($relation->getParent()));
         $childName = str_slug(get_class($relation->getRelated()));
         $cache = cache();
 
         if (is_subclass_of($cache->getStore(), TaggableStore::class)) {
-            $cache->tags([$parentName, $childName]);
+            $cache = $cache->tags([$parentName, $childName]);
         }
 
-        return cache()->tags([$parentName, $childName])
-            ->rememberForever("{$parentName}_{$parentIds}-{$childName}s", function () use ($relation) {
-                return $relation->getEager();
-            });
+        $cachedResults = $cache->rememberForever(
+            "{$parentName}_{$parentIds}-{$childName}s",
+            function () use ($relation, $models, $name) {
+                return $relation->match(
+                   $relation->initRelation($models, $name),
+                   $relation->getEager(),
+                   $name
+               );
+            }
+        );
+
+        return $cachedResults;
     }
 }

src/CachedModel.php

@@ -43,9 +43,9 @@ public function cache(array $tags = [])
     {
         $cache = cache();
 
-        if (is_subclass_of(cache()->getStore(), TaggableStore::class)) {
+        if (is_subclass_of($cache->getStore(), TaggableStore::class)) {
             array_push($tags, str_slug(get_called_class()));
-            $cache = cache()->tags($tags);
+            $cache = $cache->tags($tags);
         }
 
         return $cache;

tests/Unit/CacheTest.php

@@ -49,7 +49,7 @@ public function testCacheIsEmptyBeforeLoadingModels()
 
     public function testCacheIsNotEmptyAfterLoadingModels()
     {
-        (new Author)->with('books')->get()->first();
+        (new Author)->with('books')->get();
 
         $results = cache()->tags([
                 'genealabslaravelmodelcachingtestsfixturesauthor',
@@ -61,6 +61,21 @@ public function testCacheIsNotEmptyAfterLoadingModels()
     }
 
     public function testCreatingModelClearsCache()
+    {
+        $author = (new Author)->with('books')->get();
+
+        factory(Author::class)->create();
+
+        $results = cache()->tags([
+                'genealabslaravelmodelcachingtestsfixturesauthor',
+                'genealabslaravelmodelcachingtestsfixturesbook'
+            ])
+            ->get('genealabslaravelmodelcachingtestsfixturesauthor_1_2_3_4_5_6_7_8_9_10-genealabslaravelmodelcachingtestsfixturesbooks');
+
+        $this->assertNull($results);
+    }
+
+    public function testUpdatingModelClearsCache()
     {
         $author = (new Author)->with('books')->get()->first();
         $author->name = "John Jinglheimer";
@@ -94,54 +109,71 @@ public function testHasManyRelationshipIsCached()
         $authors = (new Author)->with('books')->get();
         $authorIds = implode('_', $authors->pluck('id')->toArray());
 
-        $results = cache()->tags([
+        $results = collect(cache()->tags([
                 'genealabslaravelmodelcachingtestsfixturesauthor',
                 'genealabslaravelmodelcachingtestsfixturesbook'
             ])
-            ->get("genealabslaravelmodelcachingtestsfixturesauthor_{$authorIds}-genealabslaravelmodelcachingtestsfixturesbooks");
+            ->get("genealabslaravelmodelcachingtestsfixturesauthor_{$authorIds}-genealabslaravelmodelcachingtestsfixturesbooks"));
 
         $this->assertNotNull($results);
+        $this->assertEmpty($authors->diffAssoc($results));
+        $this->assertNotEmpty($authors);
+        $this->assertNotEmpty($results);
+        $this->assertEquals($authors->count(), $results->count());
     }
 
     public function testBelongsToRelationshipIsCached()
     {
-        $books = (new Book)->with('author')->get()->first();
+        $books = (new Book)->with('author')->get();
         $bookIds = implode('_', $books->pluck('id')->toArray());
 
-        $results = cache()->tags([
+        $results = collect(cache()->tags([
                 'genealabslaravelmodelcachingtestsfixturesbook',
                 'genealabslaravelmodelcachingtestsfixturesauthor'
             ])
-            ->get("genealabslaravelmodelcachingtestsfixturesbook_{$bookIds}-genealabslaravelmodelcachingtestsfixturesauthors");
+            ->get("genealabslaravelmodelcachingtestsfixturesbook_{$bookIds}-genealabslaravelmodelcachingtestsfixturesauthors"));
 
         $this->assertNotNull($results);
+        $this->assertEmpty($books->diffAssoc($results));
+        $this->assertNotEmpty($books);
+        $this->assertNotEmpty($results);
+        $this->assertEquals($books->count(), $results->count());
     }
 
     public function testBelongsToManyRelationshipIsCached()
     {
         $books = (new Book)->with('stores')->get();
         $bookIds = implode('_', $books->pluck('id')->toArray());
 
-        $results = cache()->tags([
+        $results = collect(cache()->tags([
                 'genealabslaravelmodelcachingtestsfixturesbook',
                 'genealabslaravelmodelcachingtestsfixturesstore'
             ])
-            ->get("genealabslaravelmodelcachingtestsfixturesbook_{$bookIds}-genealabslaravelmodelcachingtestsfixturesstores");
+            ->get("genealabslaravelmodelcachingtestsfixturesbook_{$bookIds}-genealabslaravelmodelcachingtestsfixturesstores"));
 
         $this->assertNotNull($results);
+        $this->assertEmpty($books->diffAssoc($results));
+        $this->assertNotEmpty($books);
+        $this->assertNotEmpty($results);
+        $this->assertEquals($books->count(), $results->count());
     }
 
     public function testHasOneRelationshipIsCached()
     {
         $authors = (new Author)->with('profile')->get();
         $authorIds = implode('_', $authors->pluck('id')->toArray());
 
-        $results = cache()->tags([
+        $results = collect(cache()
+            ->tags([
                 'genealabslaravelmodelcachingtestsfixturesauthor',
                 'genealabslaravelmodelcachingtestsfixturesprofile'
             ])
-            ->get("genealabslaravelmodelcachingtestsfixturesauthor_{$authorIds}-genealabslaravelmodelcachingtestsfixturesprofiles");
+            ->get("genealabslaravelmodelcachingtestsfixturesauthor_{$authorIds}-genealabslaravelmodelcachingtestsfixturesprofiles"));
 
         $this->assertNotNull($results);
+        $this->assertEmpty($authors->diffAssoc($results));
+        $this->assertNotEmpty($authors);
+        $this->assertNotEmpty($results);
+        $this->assertEquals($authors->count(), $results->count());
     }
 }