Brought all tests back to green.

Author: mikebronner

database/seeders/LaravelGovernorPermissionsTableSeeder.php

@@ -21,12 +21,13 @@ public function run()
 
         foreach ($entities as $entity) {
             foreach ($actions as $action) {
-                (new $permissionClass)->firstOrCreate([
+                $permission = (new $permissionClass)->firstOrNew([
                     "role_name" => $superadmin->name,
                     "action_name" => $action->name,
                     "ownership_name" => $ownership->name,
                     "entity_name" => $entity->name,
                 ]);
+                $permission->saveQuietly();
             }
         }
     }

src/Permission.php

@@ -24,6 +24,28 @@ class Permission extends Model
     ];
     protected $table = "governor_permissions";
 
+    protected static function syncPermissionsSingleton(): void
+    {
+        $permissionClass = config("genealabs-laravel-governor.models.permission");
+        $permissions = (new $permissionClass)
+            ->with("role", "team")
+            ->toBase()
+            ->get();
+        app()->instance("governor-permissions", $permissions);
+    }
+
+    public static function boot(): void
+    {
+        parent::boot();
+
+        static::saved(function () {
+            self::syncPermissionsSingleton();
+        });
+        static::deleted(function () {
+            self::syncPermissionsSingleton();
+        });
+    }
+
     public function entity(): BelongsTo
     {
         return $this->belongsTo(

src/Policies/BasePolicy.php

@@ -128,15 +128,17 @@ protected function validatePermissions(
             return true;
         }
 
-        if ($user->roles->isEmpty()
+        if (
+            $user->roles->isEmpty()
             && $user->teams->isEmpty()
         ) {
             return false;
         }
 
         $ownership = 'other';
 
-        if ($model
+        if (
+            $model
             && $user->getKey() == $model->governor_owned_by
         ) {
             $ownership = 'own';
@@ -145,7 +147,8 @@ protected function validatePermissions(
         $filteredPermissions = $this->filterPermissions($action, $entity, $ownership);
 
         foreach ($filteredPermissions as $permission) {
-            if ($user->roles->pluck("name")->contains($permission->role_name)
+            if (
+                $user->roles->pluck("name")->contains($permission->role_name)
                 || $user->teams->pluck("id")->contains($permission->team_id)
             ) {
                 return true;

src/Traits/Governable.php

@@ -18,13 +18,13 @@ protected function applyPermissionToQuery(Builder $query, string $ability): Buil
         $entityName = $this->getEntityFromModel(get_class($this));
         $ownerships = $this->getOwnershipsForEntity($entityName, $ability);
 
-        return $this->filterQuery($query, $ownerships);
+        return $this->filterQuery($query, $ownerships->pluck("ownership_name"));
     }
 
     protected function filterQuery(Builder $query, Collection $ownerships): Builder
     {
         if (
-            $ownerships->pluck("ownership_name")->contains("any")
+            $ownerships->contains("any")
             || auth()->user()->hasRole("SuperAdmin")
         ) {
             return $query;
@@ -35,7 +35,6 @@ protected function filterQuery(Builder $query, Collection $ownerships): Builder
             $authTable = (new $authModel)->getTable();
 
             if (method_exists($query->getModel(), "teams")) {
-
                 if ($query->getModel()->getTable() === $authTable) {
                     return $query
                         ->whereHas("teams", function ($query) {
@@ -55,12 +54,15 @@ protected function filterQuery(Builder $query, Collection $ownerships): Builder
             }
 
             if ($query->getModel()->getTable() === $authTable) {
-                return $query->where($query->getModel()->getKeyName(), auth()->user()->getKey());
+                return $query->where(
+                    $query->getModel()->getKeyName(),
+                    auth()->user()->getKey(),
+                );
             }
 
             return $query->where(
                 "{$query->getModel()->getTable()}.governor_owned_by",
-                auth()->user()->getKey()
+                auth()->user()->getKey(),
             );
         }
 

src/Traits/GovernorOwnedByField.php

@@ -12,7 +12,7 @@
 
 trait GovernorOwnedByField
 {
-    protected function createGovernorOwnedByFieldsByPolicy(BasePolicy $policy) : bool
+    protected function createGovernorOwnedByFieldsByPolicy(BasePolicy $policy): bool
     {
         $gate = app("Illuminate\Contracts\Auth\Access\Gate");
         $reflection = new ReflectionClass($gate);

tests/CreatesApplication.php

@@ -37,7 +37,7 @@ protected function getPackageProviders($app)
         ];
     }
 
-    protected function setUp() : void
+    protected function setUp(): void
     {
         parent::setUp();
 
@@ -50,5 +50,26 @@ protected function setUp() : void
             '--class' => LaravelGovernorDatabaseSeeder::class,
             '--no-interaction' => true
             ]);
+
+        $actionClass = app(config('genealabs-laravel-governor.models.action'));
+        $entityClass = app(config('genealabs-laravel-governor.models.entity'));
+        $roleClass = config("genealabs-laravel-governor.models.role");
+        $actions = (new $actionClass)
+            ->orderBy("name")
+            ->get();
+        $entities = (new $entityClass)
+            ->select("name")
+            ->with("group:name")
+            ->orderBy("name")
+            ->toBase()
+            ->get();
+        $roles = (new $roleClass)
+            ->select('name')
+            ->toBase()
+            ->get();
+
+        app()->instance("governor-actions", $actions);
+        app()->instance("governor-entities", $entities);
+        app()->instance("governor-roles", $roles);
     }
 }

tests/Integration/Traits/GovernableTest.php

@@ -165,7 +165,6 @@ public function testScopeViewableWithAnyPermission()
         $this->assertTrue($results->contains($this->otherAuthor));
     }
 
-    /** @group test */
     public function testScopeViewableWithOwnPermission()
     {
         (new Permission)->firstOrCreate([
@@ -193,7 +192,7 @@ public function testScopeViewableWithOwnPermission()
         $userResults = (new $userClass)
             ->viewable()
             ->get();
-// dd($authorResults, $this->otherAuthor, $authorResults->contains($this->otherAuthor));
+
         $this->assertTrue($authorResults->isNotEmpty());
         $this->assertTrue($authorResults->contains($this->author));
         $this->assertFalse($authorResults->contains($this->otherAuthor));

tests/Integration/Traits/GoverningTest.php

@@ -52,7 +52,6 @@ public function testOwnedTeamsRelationship()
         $this->assertTrue($this->user->ownedTeams->contains($this->team));
     }
 
-    /** @group test */
     public function testPermissionsAttribute()
     {
         $permission = (new Permission)->create([

tests/Integration/Traits/GovernorOwnedByFieldTest.php

@@ -30,6 +30,6 @@ public function testUsingPolicyWhereModelDoesntHaveGovernorOwnedByField()
     {
         $result = $this->createGovernorOwnedByFields(new User);
 
-        $this->assertTrue($result);
+        $this->assertFalse($result);
     }
 }

tests/UnitTestCase.php

@@ -1,4 +1,8 @@
-<?php namespace GeneaLabs\LaravelGovernor\Tests;
+<?php
+
+declare(strict_types=1);
+
+namespace GeneaLabs\LaravelGovernor\Tests;
 
 use Orchestra\Testbench\TestCase;