mirror of
https://github.com/phpbb/phpbb.git
synced 2025-05-15 12:05:21 +02:00
Merge remote-tracking branch 'nickvergessen/ticket/11494' into develop
* nickvergessen/ticket/11494: [ticket/11494] Filter crawler in first place [ticket/11494] Use functions instead of repeating [ticket/11494] Fix memberlist leaders functional tests
This commit is contained in:
commit
bf98122cf4
@ -41,38 +41,59 @@ class phpbb_functional_memberlist_test extends phpbb_functional_test_case
|
||||
$this->assertContains('admin', $crawler->filter('h2')->text());
|
||||
}
|
||||
|
||||
protected function get_memberlist_leaders_table_crawler()
|
||||
{
|
||||
$crawler = $this->request('GET', 'memberlist.php?mode=leaders&sid=' . $this->sid);
|
||||
$this->assert_response_success();
|
||||
|
||||
return $crawler->filter('.forumbg-table');
|
||||
}
|
||||
|
||||
public function test_leaders()
|
||||
{
|
||||
$this->login();
|
||||
$this->create_user('memberlist-test-moderator');
|
||||
|
||||
// Admin should be listed, user not
|
||||
$crawler = $this->request('GET', 'memberlist.php?mode=leaders&sid=' . $this->sid);
|
||||
$this->assert_response_success();
|
||||
$this->assertContains('admin', $crawler->text());
|
||||
$this->assertNotContains('memberlist-test-user', $crawler->text());
|
||||
$this->assertNotContains('memberlist-test-moderator', $crawler->text());
|
||||
$crawler = $this->get_memberlist_leaders_table_crawler();
|
||||
|
||||
// Admin in admin group, but not in moderators
|
||||
$this->assertContains('admin', $crawler->eq(0)->text());
|
||||
$this->assertNotContains('admin', $crawler->eq(1)->text());
|
||||
|
||||
// memberlist-test-user in neither group
|
||||
$this->assertNotContains('memberlist-test-user', $crawler->eq(0)->text());
|
||||
$this->assertNotContains('memberlist-test-user', $crawler->eq(1)->text());
|
||||
|
||||
// memberlist-test-moderator in neither group
|
||||
$this->assertNotContains('memberlist-test-moderator', $crawler->eq(0)->text());
|
||||
$this->assertNotContains('memberlist-test-moderator', $crawler->eq(1)->text());
|
||||
}
|
||||
|
||||
public function test_leaders_remove_users()
|
||||
{
|
||||
$this->login();
|
||||
|
||||
// Remove admin from admins
|
||||
// Remove admin from admins, but is now in moderators
|
||||
$this->remove_user_group('ADMINISTRATORS', array('admin'));
|
||||
$crawler = $this->request('GET', 'memberlist.php?mode=leaders&sid=' . $this->sid);
|
||||
$this->assert_response_success();
|
||||
$this->assertContains('admin', $crawler->text());
|
||||
$crawler = $this->get_memberlist_leaders_table_crawler();
|
||||
$this->assertNotContains('admin', $crawler->eq(0)->text());
|
||||
$this->assertContains('admin', $crawler->eq(1)->text());
|
||||
|
||||
// Remove admin from moderators, should not be visible anymore
|
||||
$this->remove_user_group('GLOBAL_MODERATORS', array('admin'));
|
||||
$crawler = $this->get_memberlist_leaders_table_crawler();
|
||||
$this->assertNotContains('admin', $crawler->eq(0)->text());
|
||||
$this->assertNotContains('admin', $crawler->eq(1)->text());
|
||||
}
|
||||
|
||||
public function test_leaders_add_users()
|
||||
{
|
||||
$this->login();
|
||||
|
||||
// Add mod to moderators
|
||||
// Add memberlist-test-moderator to moderators
|
||||
$this->add_user_group('GLOBAL_MODERATORS', array('memberlist-test-moderator'));
|
||||
$crawler = $this->request('GET', 'memberlist.php?mode=leaders&sid=' . $this->sid);
|
||||
$this->assert_response_success();
|
||||
$this->assertContains('memberlist-test-moderator', $crawler->text());
|
||||
$crawler = $this->get_memberlist_leaders_table_crawler();
|
||||
$this->assertNotContains('memberlist-test-moderator', $crawler->eq(0)->text());
|
||||
$this->assertContains('memberlist-test-moderator', $crawler->eq(1)->text());
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user