3 files changed, 13 insertions, 45 deletions
diff --git a/tests/functional/auth_test.php b/tests/functional/auth_test.php
index e955dcb4df..e67118d8f9 100644
--- a/tests/functional/auth_test.php
+++ b/tests/functional/auth_test.php
@@ -21,6 +21,15 @@ class phpbb_functional_auth_test extends phpbb_functional_test_case
 		$this->assertContains($this->lang('LOGOUT_USER', 'admin'), $crawler->filter('.navbar')->text());
 	}
 
+	public function test_login_other()
+	{
+		$this->create_user('user');
+		$this->login('user');
+		$crawler = $this->request('GET', 'index.php');
+		$this->assertContains('user', $crawler->filter('.icon-logout')->text());
+		$this->delete_user('user');
+	}
+
 	/**
 	* @depends test_login
 	*/
diff --git a/tests/functional/new_user_test.php b/tests/functional/new_user_test.php
deleted file mode 100644
index db2f31f450..0000000000
--- a/tests/functional/new_user_test.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
-*
-* @package testing
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @group functional
-*/
-class phpbb_functional_new_user_test extends phpbb_functional_test_case
-{
-	public function test_create_user()
-	{
-		$this->create_user('user');
-		$this->login();
-		$crawler = $this->request('GET', 'memberlist.php?sid=' . $this->sid);
-		$this->assertContains('user', $crawler->filter('#memberlist tr')->eq(1)->text());
-	}
-
-	/**
-	* @depends test_create_user
-	*/
-	public function test_delete_user()
-	{
-		$this->delete_user('user');
-		$this->login();
-		$crawler = $this->request('GET', 'memberlist.php?sid=' . $this->sid);
-		$this->assertEquals(2, $crawler->filter('#memberlist tr')->count());
-	}
-
-	/**
-	* @depends test_delete_user
-	*/
-	public function test_login_other()
-	{
-		$this->create_user('user');
-		$this->login('user');
-		$crawler = $this->request('GET', 'index.php');
-		$this->assertContains('user', $crawler->filter('.icon-logout')->text());
-		$this->delete_user('user');
-	}
-}
diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
index dfbfe2565e..a72c0940ab 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -197,6 +197,10 @@ class phpbb_functional_test_case extends phpbb_test_case
 	/**
 	* Creates a new user with limited permissions
 	*
+	* Note that creating two users with the same name results in undefined
+	* login behaviour. Always call delete_user after running a test that
+	* requires create_user.
+	*
 	* @param string $username Also doubles up as the user's password
 	*/
 	protected function create_user($username)