2 files changed, 232 insertions, 231 deletions
diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
index 07ef826abf..49cc72363e 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -11,12 +11,14 @@
 *
 */
 use Symfony\Component\BrowserKit\CookieJar;
-use Behat\Mink\Driver\Goutte\Client;
-use Behat\Mink\Driver\GoutteDriver;
 
-class phpbb_functional_test_case extends phpbb_mink_test_case
+require_once __DIR__ . '/../../phpBB/includes/functions_install.php';
+
+class phpbb_functional_test_case extends phpbb_test_case
 {
+	static protected $client;
 	static protected $cookieJar;
+	static protected $root_url;
 
 	protected $cache = null;
 	protected $db = null;
@@ -34,6 +36,7 @@ class phpbb_functional_test_case extends phpbb_mink_test_case
 	*/
 	protected $lang = array();
 
+	static protected $config = array();
 	static protected $already_installed = false;
 
 	static public function setUpBeforeClass()
@@ -43,24 +46,6 @@ class phpbb_functional_test_case extends phpbb_mink_test_case
 		self::$config = phpbb_test_case_helpers::get_test_config();
 		self::$root_url = self::$config['phpbb_functional_url'];
 
-		self::$cookieJar = new CookieJar;
-		self::$client = new Client(array(), null, self::$cookieJar);
-
-		$client_options = array(
-			Guzzle\Http\Client::DISABLE_REDIRECTS	=> true,
-			'curl.options'	=> array(
-				CURLOPT_TIMEOUT	=> 120,
-			),
-		);
-
-		self::$client->setClient(new Guzzle\Http\Client('', $client_options));
-
-		// Reset the curl handle because it is 0 at this point and not a valid
-		// resource
-		self::$client->getClient()->getCurlMulti()->reset(true);
-
-		self::$driver = new GoutteDriver(self::$client);
-
 		// Important: this is used both for installation and by
 		// test cases for querying the tables.
 		// Therefore table prefix must be set before a board is
@@ -93,6 +78,12 @@ class phpbb_functional_test_case extends phpbb_mink_test_case
 
 		$this->bootstrap();
 
+		self::$cookieJar = new CookieJar;
+		self::$client = new Goutte\Client(array(), null, self::$cookieJar);
+		// Reset the curl handle because it is 0 at this point and not a valid
+		// resource
+		self::$client->getClient()->getCurlMulti()->reset(true);
+
 		// Clear the language array so that things
 		// that were added in other tests are gone
 		$this->lang = array();
@@ -119,14 +110,13 @@ class phpbb_functional_test_case extends phpbb_mink_test_case
 
 	protected function tearDown()
 	{
+		parent::tearDown();
+
 		if ($this->db instanceof \phpbb\db\driver\driver_interface)
 		{
 			// Close the database connections again this test
 			$this->db->sql_close();
 		}
-
-		self::$cookieJar->clear();
-		parent::tearDown();
 	}
 
 	/**
@@ -249,7 +239,7 @@ class phpbb_functional_test_case extends phpbb_mink_test_case
 		);
 		$container = new phpbb_mock_container_builder();
 		$container->set('migrator', $migrator);
-		$user = new \phpbb\user();
+		$user = new \phpbb\user('\phpbb\datetime');
 
 		$extension_manager = new \phpbb\extension\manager(
 			$container,
@@ -266,6 +256,144 @@ class phpbb_functional_test_case extends phpbb_mink_test_case
 		return $extension_manager;
 	}
 
+	static protected function install_board()
+	{
+		global $phpbb_root_path, $phpEx;
+
+		self::recreate_database(self::$config);
+
+		$config_file = $phpbb_root_path . "config.$phpEx";
+		$config_file_dev = $phpbb_root_path . "config_dev.$phpEx";
+		$config_file_test = $phpbb_root_path . "config_test.$phpEx";
+
+		if (file_exists($config_file))
+		{
+			if (!file_exists($config_file_dev))
+			{
+				rename($config_file, $config_file_dev);
+			}
+			else
+			{
+				unlink($config_file);
+			}
+		}
+
+		self::$cookieJar = new CookieJar;
+		self::$client = new Goutte\Client(array(), null, self::$cookieJar);
+		// Set client manually so we can increase the cURL timeout
+		self::$client->setClient(new Guzzle\Http\Client('', array(
+			Guzzle\Http\Client::DISABLE_REDIRECTS	=> true,
+			'curl.options'	=> array(
+				CURLOPT_TIMEOUT	=> 120,
+			),
+		)));
+
+		// Reset the curl handle because it is 0 at this point and not a valid
+		// resource
+		self::$client->getClient()->getCurlMulti()->reset(true);
+
+		$parseURL = parse_url(self::$config['phpbb_functional_url']);
+
+		$crawler = self::request('GET', 'install/index.php?mode=install&language=en');
+		self::assertContains('Welcome to Installation', $crawler->filter('#main')->text());
+		$form = $crawler->selectButton('submit')->form();
+
+		// install/index.php?mode=install&sub=requirements
+		$crawler = self::submit($form);
+		self::assertContains('Installation compatibility', $crawler->filter('#main')->text());
+		$form = $crawler->selectButton('submit')->form();
+
+		// install/index.php?mode=install&sub=database
+		$crawler = self::submit($form);
+		self::assertContains('Database configuration', $crawler->filter('#main')->text());
+		$form = $crawler->selectButton('submit')->form(array(
+			// Installer uses 3.0-style dbms name
+			'dbms'			=> str_replace('phpbb\db\driver\\', '',  self::$config['dbms']),
+			'dbhost'		=> self::$config['dbhost'],
+			'dbport'		=> self::$config['dbport'],
+			'dbname'		=> self::$config['dbname'],
+			'dbuser'		=> self::$config['dbuser'],
+			'dbpasswd'		=> self::$config['dbpasswd'],
+			'table_prefix'	=> self::$config['table_prefix'],
+		));
+
+		// install/index.php?mode=install&sub=database
+		$crawler = self::submit($form);
+		self::assertContains('Successful connection', $crawler->filter('#main')->text());
+		$form = $crawler->selectButton('submit')->form();
+
+		// install/index.php?mode=install&sub=administrator
+		$crawler = self::submit($form);
+		self::assertContains('Administrator configuration', $crawler->filter('#main')->text());
+		$form = $crawler->selectButton('submit')->form(array(
+			'default_lang'	=> 'en',
+			'admin_name'	=> 'admin',
+			'admin_pass1'	=> 'adminadmin',
+			'admin_pass2'	=> 'adminadmin',
+			'board_email'	=> 'nobody@example.com',
+		));
+
+		// install/index.php?mode=install&sub=administrator
+		$crawler = self::submit($form);
+		self::assertContains('Tests passed', $crawler->filter('#main')->text());
+		$form = $crawler->selectButton('submit')->form();
+
+		// We have to skip install/index.php?mode=install&sub=config_file
+		// because that step will create a config.php file if phpBB has the
+		// permission to do so. We have to create the config file on our own
+		// in order to get the DEBUG constants defined.
+		$config_php_data = phpbb_create_config_file_data(self::$config, self::$config['dbms'], true, false, true);
+		$config_created = file_put_contents($config_file, $config_php_data) !== false;
+		if (!$config_created)
+		{
+			self::markTestSkipped("Could not write $config_file file.");
+		}
+
+		// We also have to create a install lock that is normally created by
+		// the installer. The file will be removed by the final step of the
+		// installer.
+		$install_lock_file = $phpbb_root_path . 'cache/install_lock';
+		$lock_created = file_put_contents($install_lock_file, '') !== false;
+		if (!$lock_created)
+		{
+			self::markTestSkipped("Could not create $lock_created file.");
+		}
+		@chmod($install_lock_file, 0666);
+
+		// install/index.php?mode=install&sub=advanced
+		$form_data = $form->getValues();
+		unset($form_data['submit']);
+
+		$crawler = self::request('POST', 'install/index.php?mode=install&sub=advanced', $form_data);
+		self::assertContains('The settings on this page are only necessary to set if you know that you require something different from the default.', $crawler->filter('#main')->text());
+		$form = $crawler->selectButton('submit')->form(array(
+			'email_enable'		=> true,
+			'smtp_delivery'		=> true,
+			'smtp_host'			=> 'nxdomain.phpbb.com',
+			'smtp_auth'			=> 'PLAIN',
+			'smtp_user'			=> 'nxuser',
+			'smtp_pass'			=> 'nxpass',
+			'cookie_secure'		=> false,
+			'force_server_vars'	=> false,
+			'server_protocol'	=> $parseURL['scheme'] . '://',
+			'server_name'		=> 'localhost',
+			'server_port'		=> isset($parseURL['port']) ? (int) $parseURL['port'] : 80,
+			'script_path'		=> $parseURL['path'],
+		));
+
+		// install/index.php?mode=install&sub=create_table
+		$crawler = self::submit($form);
+		self::assertContains('The database tables used by phpBB', $crawler->filter('#main')->text());
+		self::assertContains('have been created and populated with some initial data.', $crawler->filter('#main')->text());
+		$form = $crawler->selectButton('submit')->form();
+
+		// install/index.php?mode=install&sub=final
+		$crawler = self::submit($form);
+		self::assertContains('You have successfully installed', $crawler->text());
+
+		copy($config_file, $config_file_test);
+	}
+
 	public function install_ext($extension)
 	{
 		$this->login();
@@ -284,6 +412,12 @@ class phpbb_functional_test_case extends phpbb_mink_test_case
 		$this->logout();
 	}
 
+	static private function recreate_database($config)
+	{
+		$db_conn_mgr = new phpbb_database_test_connection_manager($config);
+		$db_conn_mgr->recreate_db();
+	}
+
 	/**
 	* Creates a new style
 	*
@@ -464,7 +598,7 @@ class phpbb_functional_test_case extends phpbb_mink_test_case
 
 		$db = $this->get_db();
 		$phpbb_dispatcher = new phpbb_mock_event_dispatcher();
-		$user = $this->getMock('\phpbb\user');
+		$user = $this->getMock('\phpbb\user', array(), array('\phpbb\datetime'));
 		$auth = $this->getMock('\phpbb\auth\auth');
 
 		$phpbb_log = new \phpbb\log\log($db, $user, $auth, $phpbb_dispatcher, $phpbb_root_path, 'adm/', $phpEx, LOG_TABLE);
@@ -503,7 +637,7 @@ class phpbb_functional_test_case extends phpbb_mink_test_case
 
 		$db = $this->get_db();
 		$phpbb_dispatcher = new phpbb_mock_event_dispatcher();
-		$user = $this->getMock('\phpbb\user');
+		$user = $this->getMock('\phpbb\user', array(), array('\phpbb\datetime'));
 		$auth = $this->getMock('\phpbb\auth\auth');
 
 		$phpbb_log = new \phpbb\log\log($db, $user, $auth, $phpbb_dispatcher, $phpbb_root_path, 'adm/', $phpEx, LOG_TABLE);
@@ -897,6 +1031,76 @@ class phpbb_functional_test_case extends phpbb_mink_test_case
 	{
 		$this->add_lang('posting');
 
+		$crawler = $this->submit_message($posting_url, $posting_contains, $form_data);
+
+		if ($expected !== '')
+		{
+			if (isset($this->lang[$expected]))
+			{
+				$this->assertContainsLang($expected, $crawler->filter('html')->text());
+			}
+			else
+			{
+				$this->assertContains($expected, $crawler->filter('html')->text());
+			}
+			return null;
+		}
+
+		$url = $crawler->selectLink($form_data['subject'])->link()->getUri();
+
+		return array(
+			'topic_id'	=> $this->get_parameter_from_link($url, 't'),
+			'post_id'	=> $this->get_parameter_from_link($url, 'p'),
+		);
+	}
+
+	/**
+	* Creates a private message
+	*
+	* Be sure to login before creating
+	*
+	* @param string $subject
+	* @param string $message
+	* @param array $to
+	* @param array $additional_form_data Any additional form data to be sent in the request
+	* @return int private_message_id
+	*/
+	public function create_private_message($subject, $message, $to, $additional_form_data = array())
+	{
+		$this->add_lang(array('ucp', 'posting'));
+
+		$posting_url = "ucp.php?i=pm&mode=compose&sid={$this->sid}";
+
+		$form_data = array_merge(array(
+			'subject'		=> $subject,
+			'message'		=> $message,
+			'post'			=> true,
+		), $additional_form_data);
+
+		foreach ($to as $user_id)
+		{
+			$form_data['address_list[u][' . $user_id . ']'] = 'to';
+		}
+
+		$crawler = self::submit_message($posting_url, 'POST_NEW_PM', $form_data);
+
+		$this->assertContains($this->lang('MESSAGE_STORED'), $crawler->filter('html')->text());
+		$url = $crawler->selectLink($this->lang('VIEW_PRIVATE_MESSAGE', '', ''))->link()->getUri();
+
+		return $this->get_parameter_from_link($url, 'p');
+	}
+
+	/**
+	* Helper for submitting a message (post or private message)
+	*
+	* @param string $posting_url
+	* @param string $posting_contains
+	* @param array $form_data
+	* @return \Symfony\Component\DomCrawler\Crawler the crawler object
+	*/
+	protected function submit_message($posting_url, $posting_contains, $form_data)
+	{
+
 		$crawler = self::request('GET', $posting_url);
 		$this->assertContains($this->lang($posting_contains), $crawler->filter('html')->text());
 
@@ -938,27 +1142,7 @@ class phpbb_functional_test_case extends phpbb_mink_test_case
 		// I use a request because the form submission method does not allow you to send data that is not
 		// contained in one of the actual form fields that the browser sees (i.e. it ignores "hidden" inputs)
 		// Instead, I send it as a request with the submit button "post" set to true.
-		$crawler = self::request('POST', $posting_url, $form_data);
-
-		if ($expected !== '')
-		{
-			if (isset($this->lang[$expected]))
-			{
-				$this->assertContainsLang($expected, $crawler->filter('html')->text());
-			}
-			else
-			{
-				$this->assertContains($expected, $crawler->filter('html')->text());
-			}
-			return null;
-		}
-
-		$url = $crawler->selectLink($form_data['subject'])->link()->getUri();
-
-		return array(
-			'topic_id'	=> $this->get_parameter_from_link($url, 't'),
-			'post_id'	=> $this->get_parameter_from_link($url, 'p'),
-		);
+		return self::request('POST', $posting_url, $form_data);
 	}
 
 	/**
diff --git a/tests/test_framework/phpbb_mink_test_case.php b/tests/test_framework/phpbb_mink_test_case.php
deleted file mode 100644
index ba480e35fb..0000000000
--- a/tests/test_framework/phpbb_mink_test_case.php
+++ /dev/null
@@ -1,183 +0,0 @@
-<?php
-/**
-*
-* This file is part of the phpBB Forum Software package.
-*
-* @copyright (c) phpBB Limited <https://www.phpbb.com>
-* @license GNU General Public License, version 2 (GPL-2.0)
-*
-* For full copyright and license information, please see
-* the docs/CREDITS.txt file.
-*
-*/
-use \Behat\Mink\Session;
-
-require_once __DIR__ . '/../../phpBB/includes/functions_install.php';
-
-abstract class phpbb_mink_test_case extends phpbb_test_case
-{
-	static protected $driver;
-	static protected $client;
-	static protected $session;
-	static protected $config = array();
-	static protected $root_url;
-
-	public function __construct($name = null, array $data = array(), $dataName = '')
-	{
-		parent::__construct($name, $data, $dataName);
-
-		$this->backupStaticAttributesBlacklist += array(
-			'phpbb_mink_test_case' => array('config', 'already_installed'),
-		);
-	}
-
-	static public function setUpBeforeClass()
-	{
-		parent::setUpBeforeClass();
-	}
-
-	public function setUp()
-	{
-		parent::setUp();
-
-		if (!self::$driver)
-		{
-			self::markTestSkipped('Mink driver not initialized.');
-		}
-
-		if (!self::$session)
-		{
-			self::$session = new Session(self::$driver);
-		}
-	}
-
-	static protected function recreate_database($config)
-	{
-		$db_conn_mgr = new phpbb_database_test_connection_manager($config);
-		$db_conn_mgr->recreate_db();
-	}
-
-	protected function tearDown()
-	{
-		self::$session->reset();
-		parent::tearDown();
-	}
-
-	static protected function visit($path)
-	{
-		self::$session->visit(self::$root_url . $path);
-		return self::$session->getPage();
-	}
-
-	static protected function click_submit($submit_button_id = 'submit')
-	{
-		self::$session->getPage()->findById($submit_button_id)->click();
-		return self::$session->getPage();
-	}
-
-	static protected function install_board()
-	{
-		global $phpbb_root_path, $phpEx;
-
-		self::recreate_database(self::$config);
-		self::$session = new Session(self::$driver);
-
-		$config_file = $phpbb_root_path . "config.$phpEx";
-		$config_file_dev = $phpbb_root_path . "config_dev.$phpEx";
-		$config_file_test = $phpbb_root_path . "config_test.$phpEx";
-
-		if (file_exists($config_file))
-		{
-			if (!file_exists($config_file_dev))
-			{
-				rename($config_file, $config_file_dev);
-			}
-			else
-			{
-				unlink($config_file);
-			}
-		}
-
-		$parseURL = parse_url(self::$config['phpbb_functional_url']);
-
-		$page = self::visit('install/index.php?mode=install');
-		self::assertContains('Welcome to Installation', $page->findById('main')->getText());
-
-		// install/index.php?mode=install&sub=requirements
-		$page = self::click_submit();
-		self::assertContains('Installation compatibility', $page->findById('main')->getText());
-
-		// install/index.php?mode=install&sub=database
-		$page = self::click_submit();
-		self::assertContains('Database configuration', $page->findById('main')->getText());
-
-		$page->findById('dbms')->setValue(str_replace('phpbb\db\driver\\', '',  self::$config['dbms']));
-		$page->findById('dbhost')->setValue(self::$config['dbhost']);
-		$page->findById('dbport')->setValue(self::$config['dbport']);
-		$page->findById('dbname')->setValue(self::$config['dbname']);
-		$page->findById('dbuser')->setValue(self::$config['dbuser']);
-		$page->findById('dbpasswd')->setValue(self::$config['dbpasswd']);
-		$page->findById('table_prefix')->setValue(self::$config['table_prefix']);
-
-		// install/index.php?mode=install&sub=database
-		$page = self::click_submit();
-		self::assertContains('Successful connection', $page->findById('main')->getText());
-
-		// install/index.php?mode=install&sub=administrator
-		$page = self::click_submit();
-		self::assertContains('Administrator configuration', $page->findById('main')->getText());
-
-		$page->findById('admin_name')->setValue('admin');
-		$page->findById('admin_pass1')->setValue('adminadmin');
-		$page->findById('admin_pass2')->setValue('adminadmin');
-		$page->findById('board_email')->setValue('nobody@example.com');
-
-		// install/index.php?mode=install&sub=administrator
-		$page = self::click_submit();
-		self::assertContains('Tests passed', $page->findById('main')->getText());
-
-		// install/index.php?mode=install&sub=config_file
-		$page = self::click_submit();
-
-		// Installer has created a config.php file, we will overwrite it with a
-		// config file of our own in order to get the DEBUG constants defined
-		$config_php_data = phpbb_create_config_file_data(self::$config, self::$config['dbms'], true, false, true);
-		$config_created = file_put_contents($config_file, $config_php_data) !== false;
-		if (!$config_created)
-		{
-			self::markTestSkipped("Could not write $config_file file.");
-		}
-
-		if (strpos($page->findById('main')->getText(), 'The configuration file has been written') === false)
-		{
-			$page = self::click_submit('dldone');
-		}
-		self::assertContains('The configuration file has been written', $page->findById('main')->getText());
-
-		// install/index.php?mode=install&sub=advanced
-		$page = self::click_submit();
-		self::assertContains('The settings on this page are only necessary to set if you know that you require something different from the default.', $page->findById('main')->getText());
-
-		$page->findById('smtp_delivery')->setValue('1');
-		$page->findById('smtp_host')->setValue('nxdomain.phpbb.com');
-		$page->findById('smtp_user')->setValue('nxuser');
-		$page->findById('smtp_pass')->setValue('nxpass');
-		$page->findById('server_protocol')->setValue($parseURL['scheme'] . '://');
-		$page->findById('server_name')->setValue('localhost');
-		$page->findById('server_port')->setValue(isset($parseURL['port']) ? $parseURL['port'] : 80);
-		$page->findById('script_path')->setValue($parseURL['path']);
-
-		// install/index.php?mode=install&sub=create_table
-		$page = self::click_submit();
-		self::assertContains('The database tables used by phpBB', $page->findById('main')->getText());
-		self::assertContains('have been created and populated with some initial data.', $page->findById('main')->getText());
-
-		// install/index.php?mode=install&sub=final
-		$page = self::click_submit();
-		self::assertContains('You have successfully installed', $page->getText());
-
-		copy($config_file, $config_file_test);
-
-		self::$session->stop();
-	}
-}