Skip to content

Commit 6dcd0ff

Browse files
author
Philipp Kübler
committed
fix typo and add multiple wildcards tests
1 parent 7c1c48e commit 6dcd0ff

File tree

3 files changed

+19
-4
lines changed

3 files changed

+19
-4
lines changed

src/Traits/HasPermissions.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
trait HasPermissions
88
{
99
/**
10-
* Check if user has all permissions
10+
* Check if model has all permissions
1111
*
1212
* @param array|string ...$permissions
1313
* @return bool
@@ -32,7 +32,7 @@ public function hasPermissionTo(...$permissions): bool
3232
}
3333

3434
/**
35-
* Check if user has any permissions
35+
* Check if model has any permissions
3636
*
3737
* @param array|string ...$permissions
3838
* @return bool
@@ -55,7 +55,7 @@ public function hasAnyPermission(...$permissions): bool
5555
}
5656

5757
/**
58-
* Return current user permissions
58+
* Return current model permissions
5959
*
6060
* @return \Illuminate\Support\Collection
6161
*/

src/Traits/HasRoles.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public function assignRole(string $role)
2828
}
2929

3030
/**
31-
* Compare Rolename with given User Role
31+
* Compare role with given model role
3232
*
3333
* @param string $role role name
3434
* @return bool

tests/PermissionTest.php

+15
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ protected function setUp(): void
1111
$this->permissions = [
1212
'user/#',
1313
'!user/create',
14+
'test/+/+/test',
1415
];
1516

1617
$this->app['config']->set('permission.roles.user', $this->permissions);
@@ -71,4 +72,18 @@ public function testHasPermissionToNotDefined(): void
7172

7273
$this->assertFalse($this->user->hasPermissionTo('news/edit'));
7374
}
75+
76+
public function testHasPermissionToMultipleWildcards(): void
77+
{
78+
$this->user->assignRole('user');
79+
80+
$this->assertTrue($this->user->hasPermissionTo('test/testa/testb/test'));
81+
}
82+
83+
public function testHasPermissionToWrongMultipleWildcards(): void
84+
{
85+
$this->user->assignRole('user');
86+
87+
$this->assertFalse($this->user->hasPermissionTo('test/testa/test'));
88+
}
7489
}

0 commit comments

Comments
 (0)