diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-10-27 12:25:18 -0700 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-10-27 12:25:18 -0700 |
| commit | d693d91e26e3200916b0f7fd475de1e968a43fee (patch) | |
| tree | 23a6d10030bf0a2c73a10eb4e2128fed7887a9c0 | |
| parent | decabb62c0a6cecd80ecfc54bd0637fa9a446a0e (diff) | |
| parent | 2e5cc620719a9a26a936c9f808eedf9f77220df2 (diff) | |
| download | forums-d693d91e26e3200916b0f7fd475de1e968a43fee.tar forums-d693d91e26e3200916b0f7fd475de1e968a43fee.tar.gz forums-d693d91e26e3200916b0f7fd475de1e968a43fee.tar.bz2 forums-d693d91e26e3200916b0f7fd475de1e968a43fee.tar.xz forums-d693d91e26e3200916b0f7fd475de1e968a43fee.zip | |
Merge remote-tracking branch 'github-nicofuma/ticket/13226' into prep-release-3.1.0
* github-nicofuma/ticket/13226:
[ticket/13226] Add functional test for group ranks
[ticket/13226] Fix the usage of $rank_img
| -rw-r--r-- | phpBB/memberlist.php | 4 | ||||
| -rw-r--r-- | tests/functional/memberlist_test.php | 28 |
2 files changed, 30 insertions, 2 deletions
diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index e3ac8dad51..439b97b47f 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -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 />'; } } diff --git a/tests/functional/memberlist_test.php b/tests/functional/memberlist_test.php index c76ba6e37d..1da5c39401 100644 --- a/tests/functional/memberlist_test.php +++ b/tests/functional/memberlist_test.php @@ -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'); + } } |