Merge pull request #1018 from spatie/1017-tests

Add tests for #1017

src/Traits/HasRoles.php

@@ -53,6 +53,7 @@ public function roles(): MorphToMany
      *
      * @param \Illuminate\Database\Eloquent\Builder $query
      * @param string|array|\Spatie\Permission\Contracts\Role|\Illuminate\Support\Collection $roles
+     * @param string $guard
      *
      * @return \Illuminate\Database\Eloquent\Builder
      */

tests/HasRolesTest.php

@@ -339,6 +339,32 @@ public function it_can_scope_users_using_an_object()
         $this->assertEquals($scopedUsers3->count(), 1);
     }
 
+    /** @test */
+    public function it_can_scope_against_a_specific_guard()
+    {
+        $user1 = User::create(['email' => '[email protected]']);
+        $user2 = User::create(['email' => '[email protected]']);
+        $user1->assignRole('testRole');
+        $user2->assignRole('testRole2');
+
+        $scopedUsers1 = User::role('testRole', 'web')->get();
+
+        $this->assertEquals($scopedUsers1->count(), 1);
+
+        $user3 = Admin::create(['email' => '[email protected]']);
+        $user4 = Admin::create(['email' => '[email protected]']);
+        $user5 = Admin::create(['email' => '[email protected]']);
+        $testAdminRole2 = app(Role::class)->create(['name' => 'testAdminRole2', 'guard_name' => 'admin']);
+        $user3->assignRole($this->testAdminRole);
+        $user4->assignRole($this->testAdminRole);
+        $user5->assignRole($testAdminRole2);
+        $scopedUsers2 = Admin::role('testAdminRole', 'admin')->get();
+        $scopedUsers3 = Admin::role('testAdminRole2', 'admin')->get();
+
+        $this->assertEquals($scopedUsers2->count(), 2);
+        $this->assertEquals($scopedUsers3->count(), 1);
+    }
+
     /** @test */
     public function it_throws_an_exception_when_trying_to_scope_a_role_from_another_guard()
     {