1 files changed, 70 insertions, 8 deletions

diff --git a/tests/functional/memberlist_test.php b/tests/functional/memberlist_test.php
index 879bee2f0e..738ec4f9dd 100644
--- a/tests/functional/memberlist_test.php
+++ b/tests/functional/memberlist_test.php
@@ -17,18 +17,15 @@ class phpbb_functional_memberlist_test extends phpbb_functional_test_case
 		$this->create_user('memberlist-test-user');
 		// logs in as admin
 		$this->login();
-		$crawler = $this->request('GET', 'memberlist.php?sid=' . $this->sid);
-		$this->assert_response_success();
+		$crawler = self::request('GET', 'memberlist.php?sid=' . $this->sid);
 		$this->assertContains('memberlist-test-user', $crawler->text());
 
 		// restrict by first character
-		$crawler = $this->request('GET', 'memberlist.php?first_char=m&sid=' . $this->sid);
-		$this->assert_response_success();
+		$crawler = self::request('GET', 'memberlist.php?first_char=m&sid=' . $this->sid);
 		$this->assertContains('memberlist-test-user', $crawler->text());
 
 		// make sure results for wrong character are not returned
-		$crawler = $this->request('GET', 'memberlist.php?first_char=a&sid=' . $this->sid);
-		$this->assert_response_success();
+		$crawler = self::request('GET', 'memberlist.php?first_char=a&sid=' . $this->sid);
 		$this->assertNotContains('memberlist-test-user', $crawler->text());
 	}
 
@@ -36,8 +33,73 @@ class phpbb_functional_memberlist_test extends phpbb_functional_test_case
 	{
 		$this->login();
 		// XXX hardcoded user id
-		$crawler = $this->request('GET', 'memberlist.php?mode=viewprofile&u=2&sid=' . $this->sid);
-		$this->assert_response_success();
+		$crawler = self::request('GET', 'memberlist.php?mode=viewprofile&u=2&sid=' . $this->sid);
 		$this->assertContains('admin', $crawler->filter('h2')->text());
 	}
+
+	protected function get_memberlist_leaders_table_crawler()
+	{
+		$crawler = self::request('GET', 'memberlist.php?mode=leaders&sid=' . $this->sid);
+		return $crawler->filter('.forumbg-table');
+	}
+
+	public function test_leaders()
+	{
+		$this->login();
+		$this->create_user('memberlist-test-moderator');
+
+		$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, but is now in moderators
+		$this->remove_user_group('ADMINISTRATORS', array('admin'));
+		$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 memberlist-test-moderator to moderators
+		$this->add_user_group('GLOBAL_MODERATORS', array('memberlist-test-moderator'));
+		$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());
+
+		// Add admin to moderators, should be visible as moderator
+		$this->add_user_group('GLOBAL_MODERATORS', array('admin'), true);
+		$crawler = $this->get_memberlist_leaders_table_crawler();
+		$this->assertNotContains('admin', $crawler->eq(0)->text());
+		$this->assertContains('admin', $crawler->eq(1)->text());
+
+		// Add admin to admins as leader, should be visible as admin, not moderator
+		$this->add_user_group('ADMINISTRATORS', array('admin'), true, true);
+		$crawler = $this->get_memberlist_leaders_table_crawler();
+		$this->assertContains('admin', $crawler->eq(0)->text());
+		$this->assertNotContains('admin', $crawler->eq(1)->text());
+	}
 }