mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-04-30 04:38:21 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'github-nicofuma/ticket/13226' into prep-release-3.1.0

Browse Source 
* github-nicofuma/ticket/13226:
  [ticket/13226] Add functional test for group ranks
  [ticket/13226] Fix the usage of $rank_img
This commit is contained in:
Nils Adermann 2014-10-27 12:25:18 -07:00
commit d693d91e26
2 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/memberlist.php
View File

@ -1089,9 +1089,9 @@ switch ($mode)
{
$user_rank_data = phpbb_get_user_rank($group_row, false);
if ($rank_img)
if ($user_rank_data['img'])
{
$rank_img .= '<br />';
$user_rank_data['img'] .= '<br />';
}
}

28
tests/functional/memberlist_test.php
View File

@ -106,4 +106,32 @@ class phpbb_functional_memberlist_test extends phpbb_functional_test_case
$this->assertContains('admin', $crawler->eq(0)->text());
$this->assertNotContains('admin', $crawler->eq(1)->text());
}
public function test_group_rank()
{
copy(__DIR__ . '/fixtures/files/valid.jpg', __DIR__ . '/../../phpBB/images/ranks/valid.jpg');
$this->login();
$this->admin_login();
$this->add_lang(array('acp/groups', 'acp/posting'));
// Set a group rank to the registered users
$crawler = self::request('GET', "adm/index.php?sid={$this->sid}&i=acp_groups&mode=manage&action=edit&g=2");
$form = $crawler->selectButton('Submit')->form();
$form['group_rank']->select('1');
$crawler = self::submit($form);
$this->assertContainsLang('GROUP_UPDATED', $crawler->filter('.successbox')->text());
// Set a rank image for site_admin
$crawler = self::request('GET', "adm/index.php?sid={$this->sid}&i=acp_ranks&mode=ranks&action=edit&id=1");
$form = $crawler->selectButton('Submit')->form();
$form['rank_image']->select('valid.jpg');
$crawler = self::submit($form);
$this->assertContainsLang('RANK_UPDATED', $crawler->filter('.successbox')->text());
$crawler = self::request('GET', 'memberlist.php?mode=group&g=2');
$this->assertContains('memberlist-test-user', $crawler->text());
unlink(__DIR__ . '/../../phpBB/images/ranks/valid.jpg');
}
}