Improve fetch team functionality

santigarcor · Dec 4, 2017 · 6c53d57 · 6c53d57
1 parent dcded93
commit 6c53d57
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/src/Helper.php b/src/Helper.php
@@ -70,16 +70,8 @@ public static function fetchTeam($team = null)
         if (is_null($team) || !Config::get('laratrust.use_teams')) {
             return null;
         }
-
-        if ($team instanceof LaratrustTeamInterface) {
-            return $team->getKey();
-        }
 
-        $team = call_user_func_array(
-                    [Config::get('laratrust.models.team'), 'where'],
-                    ['name', $team]
-                )->first();
-        return is_null($team) ? $team : $team->getKey();
+        return static::getIdFor($team, 'team');
     }
 
     /**

diff --git a/tests/LaratrustUserTest.php b/tests/LaratrustUserTest.php
@@ -64,6 +64,7 @@ public function testPermissionsRelationship()
             $this->user->permissions()
         );
     }
+
     public function testHasRole()
     {
         /*
@@ -243,11 +244,11 @@ public function testHasPermissionWithPlaceholderSupport()
         $this->assertTrue($this->user->hasPermission('admin.posts'));
         $this->assertTrue($this->user->hasPermission('admin.pages'));
         $this->assertTrue($this->user->hasPermission('admin.users'));
-        $this->assertFalse($this->user->hasPermission('admin.config', 'TeamA'));
+        $this->assertFalse($this->user->hasPermission('admin.config', 'team_a'));
 
         $this->assertTrue($this->user->hasPermission(['admin.*']));
         $this->assertTrue($this->user->hasPermission(['admin.*']));
-        $this->assertTrue($this->user->hasPermission(['config.*'], 'TeamA'));
+        $this->assertTrue($this->user->hasPermission(['config.*'], 'team_a'));
         $this->assertTrue($this->user->hasPermission(['config.*']));
         $this->assertFalse($this->user->hasPermission(['site.*']));
     }