formatting

laravel · Sep 22, 2020 · 87b4bf3 · 87b4bf3
1 parent ffb70a3
commit 87b4bf3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/src/HasTeams.php b/src/HasTeams.php
@@ -130,19 +130,9 @@ public function hasTeamRole($team, string $role)
             return true;
         }
 
-        if (! $this->belongsToTeam($team)) {
-            return false;
-        }
-
-        $roleObject = Jetstream::findRole($team->users->where(
+        return $this->belongsToTeam($team) && optional(Jetstream::findRole($team->users->where(
             'id', $this->id
-        )->first()->membership->role);
-
-        if (! $roleObject) {
-            return false;
-        }
-
-        return $roleObject->key === $role;
+        )->first()->membership->role))->key === $role;
     }
 
     /**

diff --git a/tests/AddTeamMemberTest.php b/tests/AddTeamMemberTest.php
@@ -46,6 +46,8 @@ public function test_team_members_can_be_added()
         $this->assertCount(1, $team->users);
 
         $this->assertTrue($otherUser->hasTeamRole($team, 'admin'));
+        $this->assertFalse($otherUser->hasTeamRole($team, 'editor'));
+        $this->assertFalse($otherUser->hasTeamRole($team, 'foobar'));
 
         $team->users->first()->withAccessToken(new TransientToken);