Add unit test for testWithoutGlobalScope

Author: Bill Harding

src/CacheKey.php

@@ -63,7 +63,11 @@ protected function getBindingsSlug() : string
             return '';
         }
 
-        if ($this->withoutAllScopes || ($this->withoutScopes != null && count($this->withoutScopes) == 0)) {
+        if ($this->withoutAllScopes) {
+            return Arr::query($this->model->query()->withoutGlobalScopes()->getBindings());
+        }
+
+        if (count($this->withoutScopes) > 0) {
             return Arr::query($this->model->query()->withoutGlobalScopes($this->withoutScopes)->getBindings());
         }
 

src/Traits/BuilderCaching.php

@@ -24,18 +24,16 @@ public function truncate()
 
     public function withoutGlobalScope($scope)
     {
-        if ($this->withoutScopes == null) {
-            $this->withoutScopes = [];
-        }
-
         array_push($this->withoutScopes, $scope);
 
         return parent::withoutGlobalScope($scope);
     }
 
     public function withoutGlobalScopes(array $scopes = null)
     {
-        $this->withoutScopes = $scopes;
+        if ($scopes != null) {
+            $this->withoutScopes = $scopes;
+        }
 
         if ($scopes == null || ($scopes != null && count($scopes) == 0)) {
             $this->withoutAllScopes = true;

tests/Integration/CachedBuilder/ScopeTest.php

@@ -171,7 +171,33 @@ public function testWithoutGlobalScopes()
         $user = factory(User::class)->create(["name" => "Barry Barry Barry"]);
         $this->actingAs($user);
         $authorsB = (new AuthorBeginsWithScoped)
-            ->withoutGlobalScopes()
+            ->withoutGlobalScopes(['GeneaLabs\LaravelModelCaching\Tests\Fixtures\Scopes\NameBeginsWith'])
+            ->get()
+            ->map(function ($author) {
+                return (new Str)->substr($author->name, 0, 1);
+            })
+            ->unique();
+
+        $this->assertGreaterThan(1, count($authorsA));
+        $this->assertGreaterThan(1, count($authorsB));
+    }
+
+    public function testWithoutGlobalScope()
+    {
+        factory(Author::class, 200)->create();
+        $user = factory(User::class)->create(["name" => "Andrew Junior"]);
+        $this->actingAs($user);
+        $authorsA = (new AuthorBeginsWithScoped)
+            ->withoutGlobalScope('GeneaLabs\LaravelModelCaching\Tests\Fixtures\Scopes\NameBeginsWith')
+            ->get()
+            ->map(function ($author) {
+                return (new Str)->substr($author->name, 0, 1);
+            })
+            ->unique();
+        $user = factory(User::class)->create(["name" => "Barry Barry Barry"]);
+        $this->actingAs($user);
+        $authorsB = (new AuthorBeginsWithScoped)
+            ->withoutGlobalScope('GeneaLabs\LaravelModelCaching\Tests\Fixtures\Scopes\NameBeginsWith')
             ->get()
             ->map(function ($author) {
                 return (new Str)->substr($author->name, 0, 1);