[ticket/10972] Added methods for creating and deleting basic users

Modified the login method to allow logging in of an arbitrary user.
Also added tests for the new functionality.

PHPBB3-10972

tests/functional/new_user_test.php

@@ -0,0 +1,45 @@
+<?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');
+	}
+}

tests/test_framework/phpbb_functional_test_case.php

@@ -194,7 +194,48 @@ class phpbb_functional_test_case extends phpbb_test_case
 		$db_conn_mgr->recreate_db();
 	}
 
-	protected function login()
+	/**
+	* Creates a new user with limited permissions
+	*
+	* @param string $username Also doubles up as the user's password
+	*/
+	protected function create_user($username)
+	{
+		// Required by unique_id
+		global $config;
+
+		if (!is_array($config))
+		{
+			$config = array();
+		}
+
+		$config['rand_seed'] = '';
+		$config['rand_seed_last_update'] = time() + 600;
+		
+		$db = $this->get_db();
+		$query = "
+			INSERT INTO " . self::$config['table_prefix'] . "users
+				(user_type, group_id, username, username_clean, user_regdate, user_password, user_email, user_lang, user_style, user_rank, user_colour, user_posts, user_permissions, user_ip, user_birthday, user_lastpage, user_last_confirm_key, user_post_sortby_type, user_post_sortby_dir, user_topic_sortby_type, user_topic_sortby_dir, user_avatar, user_sig, user_sig_bbcode_uid, user_from, user_icq, user_aim, user_yim, user_msnm, user_jabber, user_website, user_occ, user_interests, user_actkey, user_newpasswd)
+			VALUES
+				(0, 2, 'user', 'user', 0, '" . phpbb_hash($username) . "', 'nobody@example.com', 'en', 1, 0, '', 1, '', '', '', '', '', 't', 'a', 't', 'd', '', '', '', '', '', '', '', '', '', '', '', '', '', '')
+		";
+
+		$db->sql_query($query);
+	}
+
+	/**
+	* Deletes a user
+	*
+	* @param string $username The username of the user to delete
+	*/
+	protected function delete_user($username)
+	{
+		$db = $this->get_db();
+		$query = "DELETE FROM " . self::$config['table_prefix'] . "users WHERE username = '" . $db->sql_escape($username) . "'";
+		$db->sql_query($query);
+	}
+
+	protected function login($username = 'admin')
 	{
 		$this->add_lang('ucp');
 
@@ -202,7 +243,7 @@ class phpbb_functional_test_case extends phpbb_test_case
 		$this->assertContains($this->lang('LOGIN_EXPLAIN_UCP'), $crawler->filter('html')->text());
 
 		$form = $crawler->selectButton($this->lang('LOGIN'))->form();
-		$login = $this->client->submit($form, array('username' => 'admin', 'password' => 'admin'));
+		$login = $this->client->submit($form, array('username' => $username, 'password' => $username));
 
 		$cookies = $this->cookieJar->all();