mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-07-31 13:40:20 +02:00
Code Issues Releases Wiki Activity

Rename viewDiscussions => viewForum, viewUserList => searchUsers (#2854)

Browse Source 
This naming is clearer as to the intended effect. Changes include:

- A migration to rename all permissions
- Updating the seed migration to use the original naming from the start
- Replacing usage of the old names with new names in code
- Throwing warnings when the old names are used.
This commit is contained in:
Alexander Skvortsov
2021-05-11 15:15:27 -04:00
committed by GitHub
parent 06f63a2087
commit d64750b3eb
17 changed files with 82 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/integration/api/access_tokens/RemembererTest.php
View File

@@ -50,7 +50,7 @@ class RemembererTest extends TestCase
Carbon::setTestNow();
$data = json_decode($response->getBody(), true);
$this->assertFalse($data['data']['attributes']['canViewUserList']);
$this->assertFalse($data['data']['attributes']['canSearchUsers']);
}
/**
@@ -71,7 +71,7 @@ class RemembererTest extends TestCase
Carbon::setTestNow();
$data = json_decode($response->getBody(), true);
$this->assertFalse($data['data']['attributes']['canViewUserList']);
$this->assertFalse($data['data']['attributes']['canSearchUsers']);
}
/**
@@ -92,6 +92,6 @@ class RemembererTest extends TestCase
Carbon::setTestNow();
$data = json_decode($response->getBody(), true);
$this->assertTrue($data['data']['attributes']['canViewUserList']);
$this->assertTrue($data['data']['attributes']['canSearchUsers']);
}
}

8
tests/integration/api/authentication/WithApiKeyTest.php
View File

@@ -46,7 +46,7 @@ class WithApiKeyTest extends TestCase
);
$data = json_decode($response->getBody()->getContents(), true);
$this->assertFalse($data['data']['attributes']['canViewUserList']);
$this->assertFalse($data['data']['attributes']['canSearchUsers']);
}
/**
@@ -60,7 +60,7 @@ class WithApiKeyTest extends TestCase
);
$data = json_decode($response->getBody()->getContents(), true);
$this->assertTrue($data['data']['attributes']['canViewUserList']);
$this->assertTrue($data['data']['attributes']['canSearchUsers']);
$this->assertArrayHasKey('adminUrl', $data['data']['attributes']);
$key = ApiKey::where('key', 'mastertoken')->first();
@@ -79,7 +79,7 @@ class WithApiKeyTest extends TestCase
);
$data = json_decode($response->getBody()->getContents(), true);
$this->assertTrue($data['data']['attributes']['canViewUserList']);
$this->assertTrue($data['data']['attributes']['canSearchUsers']);
$this->assertArrayNotHasKey('adminUrl', $data['data']['attributes']);
$key = ApiKey::where('key', 'personaltoken')->first();
@@ -98,7 +98,7 @@ class WithApiKeyTest extends TestCase
);
$data = json_decode($response->getBody()->getContents(), true);
$this->assertTrue($data['data']['attributes']['canViewUserList']);
$this->assertTrue($data['data']['attributes']['canSearchUsers']);
$this->assertArrayNotHasKey('adminUrl', $data['data']['attributes']);
$key = ApiKey::where('key', 'personaltoken')->first();

2
tests/integration/api/posts/ListTest.php
View File

@@ -42,7 +42,7 @@ class ListTests extends TestCase
private function forbidGuestsFromSeeingForum()
{
$this->database()->table('group_permission')->where('permission', 'viewDiscussions')->where('group_id', 2)->delete();
$this->database()->table('group_permission')->where('permission', 'viewForum')->where('group_id', 2)->delete();
}
/**

8
tests/integration/api/users/GroupSearchTest.php
View File

@@ -54,7 +54,7 @@ class GroupSearchTest extends TestCase
{
$this->prepareDatabase([
'group_permission' => [
['permission' => 'viewUserList', 'group_id' => 2],
['permission' => 'searchUsers', 'group_id' => 2],
],
]);
$response = $this->createRequest(['admin'], 2);
@@ -69,7 +69,7 @@ class GroupSearchTest extends TestCase
{
$this->prepareDatabase([
'group_permission' => [
['permission' => 'viewUserList', 'group_id' => 2],
['permission' => 'searchUsers', 'group_id' => 2],
],
]);
@@ -120,7 +120,7 @@ class GroupSearchTest extends TestCase
{
$this->prepareDatabase([
'group_permission' => [
['permission' => 'viewUserList', 'group_id' => 2],
['permission' => 'searchUsers', 'group_id' => 2],
],
]);
@@ -139,7 +139,7 @@ class GroupSearchTest extends TestCase
{
$this->prepareDatabase([
'group_permission' => [
['permission' => 'viewUserList', 'group_id' => 2],
['permission' => 'searchUsers', 'group_id' => 2],
],
]);
$this->createMultipleUsersAndGroups();

6
tests/integration/api/users/ListTest.php
View File

@@ -50,7 +50,7 @@ class ListTest extends TestCase
{
$this->prepareDatabase([
'group_permission' => [
['permission' => 'viewUserList', 'group_id' => 2],
['permission' => 'searchUsers', 'group_id' => 2],
],
]);
@@ -98,7 +98,7 @@ class ListTest extends TestCase
{
$this->prepareDatabase([
'group_permission' => [
['permission' => 'viewUserList', 'group_id' => 2],
['permission' => 'searchUsers', 'group_id' => 2],
['permission' => 'user.viewLastSeenAt', 'group_id' => 2],
],
]);
@@ -120,7 +120,7 @@ class ListTest extends TestCase
{
$this->prepareDatabase([
'group_permission' => [
['permission' => 'viewUserList', 'group_id' => 2],
['permission' => 'searchUsers', 'group_id' => 2],
],
]);

4
tests/integration/api/users/ShowTest.php
View File

@@ -32,12 +32,12 @@ class ShowTest extends TestCase
private function forbidGuestsFromSeeingForum()
{
$this->database()->table('group_permission')->where('permission', 'viewDiscussions')->where('group_id', 2)->delete();
$this->database()->table('group_permission')->where('permission', 'viewForum')->where('group_id', 2)->delete();
}
private function forbidMembersFromSearchingUsers()
{
$this->database()->table('group_permission')->where('permission', 'viewUserList')->where('group_id', 3)->delete();
$this->database()->table('group_permission')->where('permission', 'searchUsers')->where('group_id', 3)->delete();
}
/**

6
tests/integration/extenders/UserTest.php
View File

@@ -82,7 +82,7 @@ class UserTest extends TestCase
$user = User::find(2);
$this->assertContains('viewUserList', $user->getPermissions());
$this->assertContains('searchUsers', $user->getPermissions());
}
/**
@@ -100,7 +100,7 @@ class UserTest extends TestCase
$user = User::find(2);
$this->assertNotContains('viewUserList', $user->getPermissions());
$this->assertNotContains('searchUsers', $user->getPermissions());
}
/**
@@ -114,7 +114,7 @@ class UserTest extends TestCase
$user = User::find(2);
$this->assertNotContains('viewUserList', $user->getPermissions());
$this->assertNotContains('searchUsers', $user->getPermissions());
}
/**