2 files changed, 38 insertions, 14 deletions
diff --git a/tests/functional/memberlist_test.php b/tests/functional/memberlist_test.php
index 66e3591f21..92ede8bd04 100644
--- a/tests/functional/memberlist_test.php
+++ b/tests/functional/memberlist_test.php
@@ -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());
 	}
 }
diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
index db6a6066e4..15c063ec02 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -530,6 +530,9 @@ class phpbb_functional_test_case extends phpbb_test_case
 		$this->assertEquals(200, $this->client->getResponse()->getStatus());
 		$content = $this->client->getResponse()->getContent();
 		$this->assertNotContains('Fatal error:', $content);
+		$this->assertNotContains('Notice:', $content);
+		$this->assertNotContains('Warning:', $content);
+		$this->assertNotContains('[phpBB Debug]', $content);
 	}
 
 	public function assert_filter($crawler, $expr, $msg = null)