mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 22:10:45 +02:00
Code Issues Releases Wiki Activity

[ticket/16524] Remove u_emoji permission checks

Browse Source 
PHPBB3-16524
This commit is contained in:
rxu
2020-06-19 17:22:34 +07:00
committed by Marc Alexander
parent b1c6b3bc94
commit befab4f3c1
8 changed files with 7 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
tests/functional/ucp_profile_test.php
View File

@@ -47,7 +47,7 @@ class phpbb_functional_ucp_profile_test extends phpbb_functional_test_case
$this->assertEquals('phpbb.youtube', $form->get('pf_phpbb_youtube')->getValue());
}
public function test_submitting_emoji_allowed()
public function test_submitting_emoji()
{
$this->add_lang('ucp');
$this->login();
@@ -65,70 +65,4 @@ class phpbb_functional_ucp_profile_test extends phpbb_functional_test_case
$form = $crawler->selectButton('Submit')->form();
$this->assertEquals('😁', $form->get('pf_phpbb_location')->getValue());
}
public function test_submitting_emoji_disallowed()
{
$this->add_lang(['ucp', 'acp/permissions']);
$this->login();
$this->admin_login();
// Group global permissions
$crawler = self::request('GET', 'adm/index.php?i=acp_permissions&icat=16&mode=setting_group_global&sid=' . $this->sid);
$this->assertContainsLang('ACP_GROUPS_PERMISSIONS_EXPLAIN', $this->get_content());
// Select Registered users group
$form = $crawler->selectButton($this->lang('SUBMIT'))->form(['group_id' => [2]]);
$crawler = self::submit($form);
$this->assertContainsLang('ACL_SET', $crawler->filter('h1')->eq(1)->text());
// Globals for \phpbb\auth\auth
global $db, $cache;
$db = $this->get_db();
$cache = new phpbb_mock_null_cache;
$auth = new \phpbb\auth\auth;
// Hardcoded user_id
$user_data = $auth->obtain_user_data(2);
$auth->acl($user_data);
$this->assertEquals(1, $auth->acl_get('u_emoji'));
// Set u_emoji to never
$form = $crawler->selectButton($this->lang('APPLY_PERMISSIONS'))->form(['setting[2][0][u_emoji]' => '0']);
$crawler = self::submit($form);
$this->assertContainsLang('AUTH_UPDATED', $crawler->text());
// check acl again
$auth = new \phpbb\auth\auth;
$user_data = $auth->obtain_user_data(2);
$auth->acl($user_data);
$this->assertEquals(0, $auth->acl_get('u_emoji'));
$crawler = self::request('GET', 'ucp.php?i=ucp_profile&mode=profile_info');
$this->assertContainsLang('UCP_PROFILE_PROFILE_INFO', $crawler->filter('#cp-main h2')->text());
$form = $crawler->selectButton('Submit')->form([
'pf_phpbb_location' => '😁', // grinning face with smiling eyes Emoji
]);
$crawler = self::submit($form);
$this->assertContains('The field “Location” has invalid characters.', $crawler->filter('p[class="error"]')->text());
// Set u_emoji back to Yes
$crawler = self::request('GET', 'adm/index.php?i=acp_permissions&icat=16&mode=setting_group_global&sid=' . $this->sid);
$this->assertContainsLang('ACP_GROUPS_PERMISSIONS_EXPLAIN', $this->get_content());
// Select Registered users group
$form = $crawler->selectButton($this->lang('SUBMIT'))->form(['group_id' => [2]]);
$crawler = self::submit($form);
$this->assertContainsLang('ACL_SET', $crawler->filter('h1')->eq(1)->text());
// Set u_emoji to never
$form = $crawler->selectButton($this->lang('APPLY_PERMISSIONS'))->form(["setting[2][0][u_emoji]" => '1']);
$crawler = self::submit($form);
$this->assertContainsLang('AUTH_UPDATED', $crawler->text());
// check acl again
$auth = new \phpbb\auth\auth;
$user_data = $auth->obtain_user_data(2);
$auth->acl($user_data);
$this->assertEquals(1, $auth->acl_get('u_emoji'));
}
}

2
tests/profilefields/type_string_test.php
View File

@@ -26,7 +26,6 @@ class phpbb_profilefield_type_string_test extends phpbb_test_case
{
global $config, $request, $user, $cache, $phpbb_root_path, $phpEx;
$auth = new \phpbb\auth\auth();
$user = $this->getMock('\phpbb\user', array(), array(
new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx)),
'\phpbb\datetime'
@@ -41,7 +40,6 @@ class phpbb_profilefield_type_string_test extends phpbb_test_case
$template = $this->getMock('\phpbb\template\template');
$this->cp = new \phpbb\profilefields\type\type_string(
$auth,
$request,
$template,
$user

2
tests/profilefields/type_url_test.php
View File

@@ -30,7 +30,6 @@ class phpbb_profilefield_type_url_test extends phpbb_test_case
{
global $config, $request, $user, $cache, $phpbb_root_path, $phpEx;
$auth = new \phpbb\auth\auth();
$config = new \phpbb\config\config([]);
$cache = new phpbb_mock_cache;
$user = $this->getMock('\phpbb\user', array(), array(
@@ -45,7 +44,6 @@ class phpbb_profilefield_type_url_test extends phpbb_test_case
$template = $this->getMock('\phpbb\template\template');
$this->cp = new \phpbb\profilefields\type\type_url(
$auth,
$request,
$template,
$user