Bring all tests to green

Author: mikebronner

src/Builder.php

@@ -15,13 +15,13 @@ protected function eagerLoadRelation(array $models, $name, Closure $constraints)
         $parentIds = implode('_', collect($models)->pluck('id')->toArray());
         $parentName = str_slug(get_class($relation->getParent()));
         $childName = str_slug(get_class($relation->getRelated()));
-        $cache = cache();
+        // $cache = cache();
+        //
+        // if (is_subclass_of($cache->getStore(), TaggableStore::class)) {
+        //     $cache->tags([$parentName, $childName]);
+        // }
 
-        if (is_subclass_of(cache()->getStore(), TaggableStore::class)) {
-            $cache->tags([$parentName, $childName]);
-        }
-
-        $results = $cache
+        $results = cache()->tags([$parentName, $childName])
             ->rememberForever("{$parentName}_{$parentIds}-{$childName}s", function () use ($relation) {
                 return $relation->getEager();
             });

src/CachedModel.php

@@ -7,6 +7,8 @@
 use Illuminate\Database\Eloquent\Relations\Relation;
 use LogicException;
 
+use Illuminate\Cache\TaggedCache;
+
 abstract class CachedModel extends Model
 {
     protected function getRelationshipFromMethod($method)
@@ -59,15 +61,21 @@ public function cache(array $tags = [])
 
         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;
     }
 
-    public static function flushCache()
+    public static function flushCache(array $tags = [])
     {
-        cache()->tags([str_slug(get_called_class())])
-            ->flush();
+        $cache = cache();
+
+        if (is_subclass_of(cache()->getStore(), TaggableStore::class)) {
+            array_push($tags, str_slug(get_called_class()));
+            $cache = cache()->tags($tags);
+        }
+
+        $cache->flush();
     }
 }

tests/Unit/CacheTest.php

@@ -13,6 +13,8 @@ public function setUp()
     {
         parent::setUp();
 
+        cache()->flush();
+
         factory(Author::class, 10)->create()
             ->each(function($author) {
                 factory(Book::class, random_int(2, 10))->make()
@@ -25,22 +27,54 @@ public function setUp()
 
     public function testCacheIsEmptyBeforeLoadingModels()
     {
-        $this->assertNull(cache()->get('genealabslaravelmodelcachingtestsfixturesauthor_1_2_3_4_5_6_7_8_9_10-genealabslaravelmodelcachingtestsfixturesbooks'));
+        $results = cache()->tags([
+                'genealabslaravelmodelcachingtestsfixturesauthor',
+                'genealabslaravelmodelcachingtestsfixturesbook'
+            ])
+            ->get('genealabslaravelmodelcachingtestsfixturesauthor_1_2_3_4_5_6_7_8_9_10-genealabslaravelmodelcachingtestsfixturesbooks');
+
+        $this->assertNull($results);
     }
 
     public function testCacheIsNotEmptyAfterLoadingModels()
     {
-        (new Author)->with('books')->get();
+        (new Author)->with('books')->get()->first();
+
+        $results = cache()->tags([
+                'genealabslaravelmodelcachingtestsfixturesauthor',
+                'genealabslaravelmodelcachingtestsfixturesbook'
+            ])
+            ->get('genealabslaravelmodelcachingtestsfixturesauthor_1_2_3_4_5_6_7_8_9_10-genealabslaravelmodelcachingtestsfixturesbooks');
 
-        $this->assertNotNull(cache()->get('genealabslaravelmodelcachingtestsfixturesauthor_1_2_3_4_5_6_7_8_9_10-genealabslaravelmodelcachingtestsfixturesbooks'));
+        $this->assertNotNull($results);
     }
 
-    public function testChangingModelClearsCache()
+    public function testCreatingModelClearsCache()
     {
-        $author = (new Author)->with('books')->first();
+        $author = (new Author)->with('books')->get()->first();
         $author->name = "John Jinglheimer";
         $author->save();
 
-        $this->assertNull(cache()->get('genealabslaravelmodelcachingtestsfixturesauthor_1_2_3_4_5_6_7_8_9_10-genealabslaravelmodelcachingtestsfixturesbooks'));
+        $results = cache()->tags([
+                'genealabslaravelmodelcachingtestsfixturesauthor',
+                'genealabslaravelmodelcachingtestsfixturesbook'
+            ])
+            ->get('genealabslaravelmodelcachingtestsfixturesauthor_1_2_3_4_5_6_7_8_9_10-genealabslaravelmodelcachingtestsfixturesbooks');
+
+        $this->assertNull($results);
+    }
+
+    public function testDeletingModelClearsCache()
+    {
+        $author = (new Author)->with('books')->get()->first();
+        $author->delete();
+
+        $results = cache()->tags([
+                'genealabslaravelmodelcachingtestsfixturesauthor',
+                'genealabslaravelmodelcachingtestsfixturesbook'
+            ])
+            ->get('genealabslaravelmodelcachingtestsfixturesauthor_1_2_3_4_5_6_7_8_9_10-genealabslaravelmodelcachingtestsfixturesbooks');
+
+        $this->assertNull($results);
     }
 }