Merge pull request #32 from GeneaLabs/laravel-5.5

- Add test of query scopes in cache key
- Add test of nested relationship queries

Author: mikebronner

Diff for: tests/Fixtures/Author.php

@@ -1,6 +1,7 @@
 <?php namespace GeneaLabs\LaravelModelCaching\Tests\Fixtures;
 
 use GeneaLabs\LaravelModelCaching\CachedModel;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\HasOne;
 
@@ -20,4 +21,9 @@ public function profile() : HasOne
     {
         return $this->hasOne(Profile::class);
     }
+
+    public function scopeStartsWithA(Builder $query) : Builder
+    {
+        return $query->where('name', 'LIKE', 'A%');
+    }
 }

Diff for: tests/Fixtures/UncachedAuthor.php

@@ -1,5 +1,6 @@
 <?php namespace GeneaLabs\LaravelModelCaching\Tests\Fixtures;
 
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\HasOne;
@@ -21,4 +22,9 @@ public function profile() : HasOne
     {
         return $this->hasOne(UncachedProfile::class, 'author_id', 'id');
     }
+
+    public function scopeStartsWithA(Builder $query) : Builder
+    {
+        return $query->where('name', 'LIKE', 'A%');
+    }
 }

Diff for: tests/Unit/CachedBuilderTest.php

@@ -537,7 +537,7 @@ public function testExistsRelationshipWhereClauseParsing()
         $this->assertEmpty($liveResults->diffAssoc($cachedResults));
     }
 
-    public function testDoesntHaveWhereClaseParsing()
+    public function testDoesntHaveWhereClauseParsing()
     {
         $authors = (new Author)
             ->doesntHave('books')
@@ -583,7 +583,8 @@ public function testColumnsRelationshipWhereClauseParsing()
     public function testRawWhereClauseParsing()
     {
         $authors = collect([(new Author)
-            ->whereRaw('name <> \'\'')->first()]);
+            ->whereRaw('name <> \'\'')
+            ->first()]);
 
         $key = 'genealabslaravelmodelcachingtestsfixturesauthor_and_name-first';
         $tags = ['genealabslaravelmodelcachingtestsfixturesauthor'];
@@ -596,4 +597,46 @@ public function testRawWhereClauseParsing()
         $this->assertTrue($authors->diffAssoc($cachedResults)->isEmpty());
         $this->assertTrue($liveResults->diffAssoc($cachedResults)->isEmpty());
     }
+
+    public function testScopeClauseParsing()
+    {
+        $author = factory(Author::class, 1)
+            ->create(['name' => 'Anton'])
+            ->first();
+        $authors = (new Author)
+            ->startsWithA()
+            ->get();
+        $key = 'genealabslaravelmodelcachingtestsfixturesauthor-name_A%';
+        $tags = ['genealabslaravelmodelcachingtestsfixturesauthor'];
+
+        $cachedResults = cache()->tags($tags)->get($key);
+        $liveResults = (new UncachedAuthor)
+            ->startsWithA()
+            ->get();
+
+        $this->assertTrue($authors->contains($author));
+        $this->assertTrue($cachedResults->contains($author));
+        $this->assertTrue($liveResults->contains($author));
+    }
+
+    public function testRelationshipQueriesAreCached()
+    {
+        $books = (new Author)
+            ->first()
+            ->books()
+            ->get();
+        $key = 'genealabslaravelmodelcachingtestsfixturesbook-books.author_id_1-books.author_id_notnull';
+        $tags = [
+            'genealabslaravelmodelcachingtestsfixturesbook'
+        ];
+
+        $cachedResults = cache()->tags($tags)->get($key);
+        $liveResults = (new UncachedAuthor)
+            ->first()
+            ->books()
+            ->get();
+
+        $this->assertTrue($cachedResults->diffAssoc($books)->isEmpty());
+        $this->assertTrue($liveResults->diffAssoc($books)->isEmpty());
+    }
 }