3 files changed, 157 insertions, 0 deletions
diff --git a/tests/functional/acp_users_test.php b/tests/functional/acp_users_test.php
new file mode 100644
index 0000000000..50d9a67dc1
--- /dev/null
+++ b/tests/functional/acp_users_test.php
@@ -0,0 +1,45 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2014 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @group functional
+*/
+class phpbb_functional_acp_users_test extends phpbb_functional_test_case
+{
+	public function setUp()
+	{
+		parent::setUp();
+
+		$this->login();
+		$this->admin_login();
+		$this->add_lang('acp/users');
+	}
+
+	public function test_founder_deletion()
+	{
+		$username = 'founder-account';
+		$user_id = $this->create_user($username);
+		$this->make_founder($user_id);
+
+		$crawler = self::request('GET', "adm/index.php?i=users&mode=overview&u=$user_id&sid={$this->sid}");
+		$form = $crawler->filter('#user_delete')->selectButton($this->lang('SUBMIT'))->form();
+		$crawler = self::submit($form);
+		$this->assertContains($this->lang('CANNOT_REMOVE_FOUNDER'), $this->get_content());
+	}
+
+	protected function make_founder($user_id)
+	{
+		$crawler = self::request('GET', "adm/index.php?i=users&mode=overview&u=$user_id&sid={$this->sid}");
+		$form = $crawler->filter('#user_overview')->selectButton($this->lang('SUBMIT'))->form();
+		$data = array('user_founder' => '1');
+		$form->setValues($data);
+		$crawler = self::submit($form);
+		$this->assertContains($this->lang('USER_OVERVIEW_UPDATED'), $this->get_content());
+	}
+}
diff --git a/tests/functions/parse_cfg_file_test.php b/tests/functions/parse_cfg_file_test.php
new file mode 100644
index 0000000000..69000ddf72
--- /dev/null
+++ b/tests/functions/parse_cfg_file_test.php
@@ -0,0 +1,103 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2014 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
+
+class phpbb_functions_parse_cfg_file extends phpbb_test_case
+{
+	public function parse_cfg_file_data()
+	{
+		return array(
+			array(
+				array(
+					'#',
+					'# phpBB Style Configuration File',
+					'#',
+					'# @package phpBB3',
+					'# @copyright (c) 2005 phpBB Group',
+					'# @license http://opensource.org/licenses/gpl-license.php GNU Public License',
+					'#',
+					'#',
+					'# At the left is the name, please do not change this',
+					'# At the right the value is entered',
+					'# For on/off options the valid values are on, off, 1, 0, true and false',
+					'#',
+					'# Values get trimmed, if you want to add a space in front or at the end of',
+					'# the value, then enclose the value with single or double quotes.',
+					'# Single and double quotes do not need to be escaped.',
+					'#',
+					'',
+					'# General Information about this style',
+					'name = prosilver',
+					'copyright = © phpBB Group, 2007',
+					'version = 3.0.12',
+				),
+				array(
+					'name'		=> 'prosilver',
+					'copyright'	=> '© phpBB Group, 2007',
+					'version'	=> '3.0.12',
+				),
+			),
+			array(
+				array(
+					'name = subsilver2',
+					'copyright = © 2005 phpBB Group',
+					'version = 3.0.12',
+				),
+				array(
+					'name'		=> 'subsilver2',
+					'copyright'	=> '© 2005 phpBB Group',
+					'version'	=> '3.0.12',
+				),
+			),
+			array(
+				array(
+					'foo = on',
+					'foo1 = true',
+					'foo2 = 1',
+					'bar = off',
+					'bar1 = false',
+					'bar2 = 0',
+					'foobar =',
+					'foobar1 = "asdf"',
+					'foobar2 = \'qwer\'',
+				),
+				array(
+					'foo'		=> true,
+					'foo1'		=> true,
+					'foo2'		=> true,
+					'bar'		=> false,
+					'bar1'		=> false,
+					'bar2'		=> false,
+					'foobar'	=> '',
+					'foobar1'	=> 'asdf',
+					'foobar2'	=> 'qwer',
+				),
+			),
+			array(
+				array(
+					'foo = &amp; bar',
+					'bar = <a href="test">Test</a>',
+				),
+				array(
+					'foo'		=> '&amp;amp; bar',
+					'bar'		=> '&lt;a href=&quot;test&quot;&gt;Test&lt;/a&gt;',
+				),
+			),
+		);
+	}
+
+	/**
+	* @dataProvider parse_cfg_file_data
+	*/
+	public function test_parse_cfg_file($file_contents, $expected)
+	{
+		$this->assertEquals($expected, parse_cfg_file(false, $file_contents));
+	}
+}
diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
index 00b31212b2..5dfe07d380 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -423,6 +423,15 @@ class phpbb_functional_test_case extends phpbb_test_case
 			$config = array();
 		}
 
+		/*
+		* Add required config entries to the config array to prevent
+		* set_config() sending an INSERT query for already existing entries,
+		* resulting in a SQL error.
+		* This is because set_config() first sends an UPDATE query, then checks
+		* sql_affectedrows() which can be 0 (e.g. on MySQL) when the new
+		* data is already there.
+		*/
+		$config['newest_user_colour'] = '';
 		$config['rand_seed'] = '';
 		$config['rand_seed_last_update'] = time() + 600;