6 files changed, 383 insertions, 23 deletions
diff --git a/tests/captcha/qa_test.php b/tests/captcha/qa_test.php
new file mode 100644
index 0000000000..1f2f9f3070
--- /dev/null
+++ b/tests/captcha/qa_test.php
@@ -0,0 +1,94 @@
+<?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.
+ *
+ */
+
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
+
+class phpbb_captcha_qa_test extends \phpbb_database_test_case
+{
+	protected $request;
+
+	/** @var \phpbb\captcha\plugins\qa */
+	protected $qa;
+
+	public function getDataSet()
+	{
+		return $this->createXMLDataSet(dirname(__FILE__) . '/../fixtures/empty.xml');
+	}
+
+	public function setUp()
+	{
+		global $db;
+
+		$db = $this->new_dbal();
+
+		parent::setUp();
+
+		$this->request = new \phpbb_mock_request();
+		request_var(false, false, false, false, $this->request);
+		$this->qa = new \phpbb\captcha\plugins\qa('phpbb_captcha_questions', 'phpbb_captcha_answers', 'phpbb_qa_confirm');
+	}
+
+	public function test_is_installed()
+	{
+		$this->assertFalse($this->qa->is_installed());
+
+		$this->qa->install();
+
+		$this->assertTrue($this->qa->is_installed());
+	}
+
+	public function test_set_get_name()
+	{
+		$this->assertNull($this->qa->get_service_name());
+		$this->qa->set_name('foobar');
+		$this->assertSame('foobar', $this->qa->get_service_name());
+	}
+
+	public function data_acp_get_question_input()
+	{
+		return array(
+			array("foobar\ntest\nyes", array(
+				'question_text'	=> '',
+				'strict'	=> false,
+				'lang_iso'	=> '',
+				'answers'	=> array('foobar', 'test', 'yes')
+			)),
+			array("foobar\ntest\n \nyes", array(
+				'question_text'	=> '',
+				'strict'	=> false,
+				'lang_iso'	=> '',
+				'answers'	=> array(
+					0 => 'foobar',
+					1 => 'test',
+					3 => 'yes',
+				)
+			)),
+			array('', array(
+				'question_text'	=> '',
+				'strict'	=> false,
+				'lang_iso'	=> '',
+				'answers'	=> '',
+			)),
+		);
+	}
+
+	/**
+	 * @dataProvider data_acp_get_question_input
+	 */
+	public function test_acp_get_question_input($value, $expected)
+	{
+		$this->request->overwrite('answers', $value);
+
+		$this->assertEquals($expected, $this->qa->acp_get_question_input());
+	}
+}
diff --git a/tests/functional/acp_attachments_test.php b/tests/functional/acp_attachments_test.php
new file mode 100644
index 0000000000..8e810a508a
--- /dev/null
+++ b/tests/functional/acp_attachments_test.php
@@ -0,0 +1,78 @@
+<?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.
+ *
+ */
+
+/**
+ * @group functional
+ */
+class phpbb_functional_acp_attachments_test extends phpbb_functional_test_case
+{
+	public function data_imagick_path_linux()
+	{
+		return array(
+			array('/usr/bin', 'Configuration updated successfully'),
+			array('/usr/foobar', 'The entered path “/usr/foobar” does not exist.'),
+			array('/usr/bin/which', 'The entered path “/usr/bin/which” is not a directory.'),
+		);
+	}
+
+	/**
+	 * @dataProvider data_imagick_path_linux
+	 */
+	public function test_imagick_path_linux($imagick_path, $expected)
+	{
+		if (strtolower(substr(PHP_OS, 0, 5)) !== 'linux')
+		{
+			$this->markTestSkipped('Unable to test linux specific paths on other OS.');
+		}
+
+		$this->login();
+		$this->admin_login();
+
+		$crawler = self::request('GET', 'adm/index.php?i=attachments&mode=attach&sid=' . $this->sid);
+
+		$form = $crawler->selectButton('Submit')->form(array('config[img_imagick]'	=> $imagick_path));
+
+		$crawler = self::submit($form);
+		$this->assertContains($expected, $crawler->filter('#main')->text());
+	}
+
+	public function data_imagick_path_windows()
+	{
+		return array(
+			array('C:\Windows', 'Configuration updated successfully'),
+			array('C:\Windows\foobar1', 'The entered path “C:\Windows\foobar1” does not exist.'),
+			array('C:\Windows\explorer.exe', 'The entered path “C:\Windows\explorer.exe” is not a directory.'),
+		);
+	}
+
+	/**
+	 * @dataProvider data_imagick_path_windows
+	 */
+	public function test_imagick_path_windows($imagick_path, $expected)
+	{
+		if (strtolower(substr(PHP_OS, 0, 3)) !== 'win')
+		{
+			$this->markTestSkipped('Unable to test windows specific paths on other OS.');
+		}
+
+		$this->login();
+		$this->admin_login();
+
+		$crawler = self::request('GET', 'adm/index.php?i=attachments&mode=attach&sid=' . $this->sid);
+
+		$form = $crawler->selectButton('Submit')->form(array('config[img_imagick]'	=> $imagick_path));
+
+		$crawler = self::submit($form);
+		$this->assertContains($expected, $crawler->filter('#main')->text());
+	}
+}
diff --git a/tests/functional/common_avatar_test_case.php b/tests/functional/common_avatar_test_case.php
index 7278f23bcc..924eb1273c 100644
--- a/tests/functional/common_avatar_test_case.php
+++ b/tests/functional/common_avatar_test_case.php
@@ -62,7 +62,7 @@ abstract class phpbb_functional_common_avatar_test_case extends phpbb_functional
 		{
 			if (is_array($value))
 			{
-				$form[$key]->$value[0]($value[1]);
+				$form[$key]->{$value[0]}($value[1]);
 			}
 			else
 			{
diff --git a/tests/functional/visibility_softdelete_test.php b/tests/functional/visibility_softdelete_test.php
index 794f0cde68..39efc99a35 100644
--- a/tests/functional/visibility_softdelete_test.php
+++ b/tests/functional/visibility_softdelete_test.php
@@ -42,6 +42,19 @@ class phpbb_functional_visibility_softdelete_test extends phpbb_functional_test_
 			'forum_perm_from'	=> 2,
 		));
 		$crawler = self::submit($form);
+
+		// Create second user which does not have m_delete permission
+		$this->add_lang('acp/permissions');
+
+		$second_user = $this->create_user('no m_delete moderator');
+		$this->add_user_group("GLOBAL_MODERATORS", 'no m_delete moderator', true);
+
+		// Set m_delete to never
+		$crawler = self::request('GET', "adm/index.php?i=acp_permissions&icat=16&mode=setting_user_global&user_id[0]=$second_user&type=m_&sid={$this->sid}");
+		$form = $crawler->selectButton($this->lang('APPLY_PERMISSIONS'))->form();
+		$data = array("setting[$second_user][0][m_delete]" => ACL_NEVER);
+		$form->setValues($data);
+		$crawler = self::submit($form);
 	}
 
 	public function test_create_post()
@@ -98,6 +111,23 @@ class phpbb_functional_visibility_softdelete_test extends phpbb_functional_test_
 			'forum_topics_softdeleted'	=> 0,
 			'forum_last_post_id'		=> $this->data['posts']['Re: Soft Delete Topic #1-#2'],
 		), 'after replying');
+
+		// Test creating another reply
+		$post3 = $this->create_post($this->data['forums']['Soft Delete #1'], $post['topic_id'], 'Re: Soft Delete Topic #1-#3', 'This is another test post posted by the testing framework.');
+		$crawler = self::request('GET', "viewtopic.php?t={$post3['topic_id']}&sid={$this->sid}");
+
+		$this->assertContains('Re: Soft Delete Topic #1-#3', $crawler->filter('html')->text());
+		$this->data['posts']['Re: Soft Delete Topic #1-#3'] = (int) $post3['post_id'];
+
+		$this->assert_forum_details($this->data['forums']['Soft Delete #1'], array(
+			'forum_posts_approved'		=> 3,
+			'forum_posts_unapproved'	=> 0,
+			'forum_posts_softdeleted'	=> 0,
+			'forum_topics_approved'		=> 1,
+			'forum_topics_unapproved'	=> 0,
+			'forum_topics_softdeleted'	=> 0,
+			'forum_last_post_id'		=> $this->data['posts']['Re: Soft Delete Topic #1-#3'],
+		), 'after replying a second time');
 	}
 
 	public function test_softdelete_post()
@@ -114,21 +144,22 @@ class phpbb_functional_visibility_softdelete_test extends phpbb_functional_test_
 			'posts' => array(
 				'Soft Delete Topic #1',
 				'Re: Soft Delete Topic #1-#2',
+				'Re: Soft Delete Topic #1-#3',
 			),
 		));
 
 		$this->assert_forum_details($this->data['forums']['Soft Delete #1'], array(
-			'forum_posts_approved'		=> 2,
+			'forum_posts_approved'		=> 3,
 			'forum_posts_unapproved'	=> 0,
 			'forum_posts_softdeleted'	=> 0,
 			'forum_topics_approved'		=> 1,
 			'forum_topics_unapproved'	=> 0,
 			'forum_topics_softdeleted'	=> 0,
-			'forum_last_post_id'		=> $this->data['posts']['Re: Soft Delete Topic #1-#2'],
+			'forum_last_post_id'		=> $this->data['posts']['Re: Soft Delete Topic #1-#3'],
 		), 'before softdelete');
 
 		$this->add_lang('posting');
-		$crawler = self::request('GET', "posting.php?mode=delete&f={$this->data['forums']['Soft Delete #1']}&p={$this->data['posts']['Re: Soft Delete Topic #1-#2']}&sid={$this->sid}");
+		$crawler = self::request('GET', "posting.php?mode=delete&f={$this->data['forums']['Soft Delete #1']}&p={$this->data['posts']['Re: Soft Delete Topic #1-#3']}&sid={$this->sid}");
 		$this->assertContainsLang('DELETE_PERMANENTLY', $crawler->text());
 
 		$form = $crawler->selectButton('Yes')->form();
@@ -136,19 +167,69 @@ class phpbb_functional_visibility_softdelete_test extends phpbb_functional_test_
 		$this->assertContainsLang('POST_DELETED', $crawler->text());
 
 		$this->assert_forum_details($this->data['forums']['Soft Delete #1'], array(
-			'forum_posts_approved'		=> 1,
+			'forum_posts_approved'		=> 2,
 			'forum_posts_unapproved'	=> 0,
 			'forum_posts_softdeleted'	=> 1,
 			'forum_topics_approved'		=> 1,
 			'forum_topics_unapproved'	=> 0,
 			'forum_topics_softdeleted'	=> 0,
-			'forum_last_post_id'		=> $this->data['posts']['Soft Delete Topic #1'],
+			'forum_last_post_id'		=> $this->data['posts']['Re: Soft Delete Topic #1-#2'],
 		), 'after softdelete');
 
 		$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Soft Delete Topic #1']}&sid={$this->sid}");
 		$this->assertContains($this->lang('POST_DISPLAY', '', ''), $crawler->text());
 	}
 
+	public function test_softdelete_post_no_m_delete()
+	{
+		$this->login('no m_delete moderator');
+		$this->load_ids(array(
+			'forums' => array(
+				'Soft Delete #1',
+				'Soft Delete #2',
+			),
+			'topics' => array(
+				'Soft Delete Topic #1',
+			),
+			'posts' => array(
+				'Soft Delete Topic #1',
+				'Re: Soft Delete Topic #1-#2',
+				'Re: Soft Delete Topic #1-#3',
+			),
+		));
+
+		$this->assert_forum_details($this->data['forums']['Soft Delete #1'], array(
+			'forum_posts_approved'		=> 2,
+			'forum_posts_unapproved'	=> 0,
+			'forum_posts_softdeleted'	=> 1,
+			'forum_topics_approved'		=> 1,
+			'forum_topics_unapproved'	=> 0,
+			'forum_topics_softdeleted'	=> 0,
+			'forum_last_post_id'		=> $this->data['posts']['Re: Soft Delete Topic #1-#2'],
+		), 'before softdelete without m_delete');
+
+		$this->add_lang('posting');
+		$crawler = self::request('GET', "posting.php?mode=delete&f={$this->data['forums']['Soft Delete #1']}&p={$this->data['posts']['Re: Soft Delete Topic #1-#2']}&sid={$this->sid}");
+		$this->assertNotContainsLang('DELETE_PERMANENTLY', $crawler->text());
+
+		$form = $crawler->selectButton('Yes')->form();
+		$crawler = self::submit($form);
+		$this->assertContainsLang('POST_DELETED', $crawler->text());
+
+		$this->assert_forum_details($this->data['forums']['Soft Delete #1'], array(
+			'forum_posts_approved'		=> 1,
+			'forum_posts_unapproved'	=> 0,
+			'forum_posts_softdeleted'	=> 2,
+			'forum_topics_approved'		=> 1,
+			'forum_topics_unapproved'	=> 0,
+			'forum_topics_softdeleted'	=> 0,
+			'forum_last_post_id'		=> $this->data['posts']['Soft Delete Topic #1'],
+		), 'after softdelete without m_delete');
+
+		$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Soft Delete Topic #1']}&sid={$this->sid}");
+		$this->assertContains($this->lang('POST_DISPLAY', '', ''), $crawler->text());
+	}
+
 	public function test_move_softdeleted_post()
 	{
 		$this->login();
@@ -163,13 +244,14 @@ class phpbb_functional_visibility_softdelete_test extends phpbb_functional_test_
 			'posts' => array(
 				'Soft Delete Topic #1',
 				'Re: Soft Delete Topic #1-#2',
+				'Re: Soft Delete Topic #1-#3',
 			),
 		));
 
 		$this->assert_forum_details($this->data['forums']['Soft Delete #1'], array(
 			'forum_posts_approved'		=> 1,
 			'forum_posts_unapproved'	=> 0,
-			'forum_posts_softdeleted'	=> 1,
+			'forum_posts_softdeleted'	=> 2,
 			'forum_topics_approved'		=> 1,
 			'forum_topics_unapproved'	=> 0,
 			'forum_topics_softdeleted'	=> 0,
@@ -212,7 +294,7 @@ class phpbb_functional_visibility_softdelete_test extends phpbb_functional_test_
 		$this->assert_forum_details($this->data['forums']['Soft Delete #2'], array(
 			'forum_posts_approved'		=> 1,
 			'forum_posts_unapproved'	=> 0,
-			'forum_posts_softdeleted'	=> 1,
+			'forum_posts_softdeleted'	=> 2,
 			'forum_topics_approved'		=> 1,
 			'forum_topics_unapproved'	=> 0,
 			'forum_topics_softdeleted'	=> 0,
@@ -234,6 +316,7 @@ class phpbb_functional_visibility_softdelete_test extends phpbb_functional_test_
 			'posts' => array(
 				'Soft Delete Topic #1',
 				'Re: Soft Delete Topic #1-#2',
+				'Re: Soft Delete Topic #1-#3'
 			),
 		));
 
@@ -250,7 +333,7 @@ class phpbb_functional_visibility_softdelete_test extends phpbb_functional_test_
 		$this->assert_forum_details($this->data['forums']['Soft Delete #2'], array(
 			'forum_posts_approved'		=> 1,
 			'forum_posts_unapproved'	=> 0,
-			'forum_posts_softdeleted'	=> 1,
+			'forum_posts_softdeleted'	=> 2,
 			'forum_topics_approved'		=> 1,
 			'forum_topics_unapproved'	=> 0,
 			'forum_topics_softdeleted'	=> 0,
@@ -283,7 +366,7 @@ class phpbb_functional_visibility_softdelete_test extends phpbb_functional_test_
 		$this->assert_forum_details($this->data['forums']['Soft Delete #2'], array(
 			'forum_posts_approved'		=> 0,
 			'forum_posts_unapproved'	=> 0,
-			'forum_posts_softdeleted'	=> 2,
+			'forum_posts_softdeleted'	=> 3,
 			'forum_topics_approved'		=> 0,
 			'forum_topics_unapproved'	=> 0,
 			'forum_topics_softdeleted'	=> 1,
@@ -305,6 +388,7 @@ class phpbb_functional_visibility_softdelete_test extends phpbb_functional_test_
 			'posts' => array(
 				'Soft Delete Topic #1',
 				'Re: Soft Delete Topic #1-#2',
+				'Re: Soft Delete Topic #1-#3'
 			),
 		));
 
@@ -321,7 +405,7 @@ class phpbb_functional_visibility_softdelete_test extends phpbb_functional_test_
 		$this->assert_forum_details($this->data['forums']['Soft Delete #2'], array(
 			'forum_posts_approved'		=> 0,
 			'forum_posts_unapproved'	=> 0,
-			'forum_posts_softdeleted'	=> 2,
+			'forum_posts_softdeleted'	=> 3,
 			'forum_topics_approved'		=> 0,
 			'forum_topics_unapproved'	=> 0,
 			'forum_topics_softdeleted'	=> 1,
@@ -344,7 +428,7 @@ class phpbb_functional_visibility_softdelete_test extends phpbb_functional_test_
 		$this->assert_forum_details($this->data['forums']['Soft Delete #1'], array(
 			'forum_posts_approved'		=> 0,
 			'forum_posts_unapproved'	=> 0,
-			'forum_posts_softdeleted'	=> 2,
+			'forum_posts_softdeleted'	=> 3,
 			'forum_topics_approved'		=> 0,
 			'forum_topics_unapproved'	=> 0,
 			'forum_topics_softdeleted'	=> 1,
@@ -376,13 +460,14 @@ class phpbb_functional_visibility_softdelete_test extends phpbb_functional_test_
 			'posts' => array(
 				'Soft Delete Topic #1',
 				'Re: Soft Delete Topic #1-#2',
+				'Re: Soft Delete Topic #1-#3'
 			),
 		));
 
 		$this->assert_forum_details($this->data['forums']['Soft Delete #1'], array(
 			'forum_posts_approved'		=> 0,
 			'forum_posts_unapproved'	=> 0,
-			'forum_posts_softdeleted'	=> 2,
+			'forum_posts_softdeleted'	=> 3,
 			'forum_topics_approved'		=> 0,
 			'forum_topics_unapproved'	=> 0,
 			'forum_topics_softdeleted'	=> 1,
@@ -417,7 +502,7 @@ class phpbb_functional_visibility_softdelete_test extends phpbb_functional_test_
 		$this->assert_forum_details($this->data['forums']['Soft Delete #1'], array(
 			'forum_posts_approved'		=> 1,
 			'forum_posts_unapproved'	=> 0,
-			'forum_posts_softdeleted'	=> 1,
+			'forum_posts_softdeleted'	=> 2,
 			'forum_topics_approved'		=> 1,
 			'forum_topics_unapproved'	=> 0,
 			'forum_topics_softdeleted'	=> 0,
@@ -449,13 +534,14 @@ class phpbb_functional_visibility_softdelete_test extends phpbb_functional_test_
 			'posts' => array(
 				'Soft Delete Topic #1',
 				'Re: Soft Delete Topic #1-#2',
+				'Re: Soft Delete Topic #1-#3'
 			),
 		));
 
 		$this->assert_forum_details($this->data['forums']['Soft Delete #1'], array(
 			'forum_posts_approved'		=> 1,
 			'forum_posts_unapproved'	=> 0,
-			'forum_posts_softdeleted'	=> 1,
+			'forum_posts_softdeleted'	=> 2,
 			'forum_topics_approved'		=> 1,
 			'forum_topics_unapproved'	=> 0,
 			'forum_topics_softdeleted'	=> 0,
@@ -495,7 +581,7 @@ class phpbb_functional_visibility_softdelete_test extends phpbb_functional_test_
 		$this->assert_forum_details($this->data['forums']['Soft Delete #1'], array(
 			'forum_posts_approved'		=> 1,
 			'forum_posts_unapproved'	=> 0,
-			'forum_posts_softdeleted'	=> 0,
+			'forum_posts_softdeleted'	=> 1,
 			'forum_topics_approved'		=> 1,
 			'forum_topics_unapproved'	=> 0,
 			'forum_topics_softdeleted'	=> 0,
@@ -528,6 +614,7 @@ class phpbb_functional_visibility_softdelete_test extends phpbb_functional_test_
 			'posts' => array(
 				'Soft Delete Topic #1',
 				'Re: Soft Delete Topic #1-#2',
+				'Re: Soft Delete Topic #1-#3'
 			),
 		));
 
@@ -539,7 +626,7 @@ class phpbb_functional_visibility_softdelete_test extends phpbb_functional_test_
 		$this->assert_forum_details($this->data['forums']['Soft Delete #1'], array(
 			'forum_posts_approved'		=> 1,
 			'forum_posts_unapproved'	=> 0,
-			'forum_posts_softdeleted'	=> 1,
+			'forum_posts_softdeleted'	=> 2,
 			'forum_topics_approved'		=> 1,
 			'forum_topics_unapproved'	=> 0,
 			'forum_topics_softdeleted'	=> 1,
@@ -562,13 +649,14 @@ class phpbb_functional_visibility_softdelete_test extends phpbb_functional_test_
 			'posts' => array(
 				'Soft Delete Topic #1',
 				'Re: Soft Delete Topic #1-#2',
+				'Re: Soft Delete Topic #1-#3'
 			),
 		));
 
 		$this->assert_forum_details($this->data['forums']['Soft Delete #1'], array(
 			'forum_posts_approved'		=> 1,
 			'forum_posts_unapproved'	=> 0,
-			'forum_posts_softdeleted'	=> 1,
+			'forum_posts_softdeleted'	=> 2,
 			'forum_topics_approved'		=> 1,
 			'forum_topics_unapproved'	=> 0,
 			'forum_topics_softdeleted'	=> 1,
@@ -603,7 +691,7 @@ class phpbb_functional_visibility_softdelete_test extends phpbb_functional_test_
 		$this->assert_forum_details($this->data['forums']['Soft Delete #1'], array(
 			'forum_posts_approved'		=> 1,
 			'forum_posts_unapproved'	=> 0,
-			'forum_posts_softdeleted'	=> 1,
+			'forum_posts_softdeleted'	=> 2,
 			'forum_topics_approved'		=> 1,
 			'forum_topics_unapproved'	=> 0,
 			'forum_topics_softdeleted'	=> 0,
@@ -625,13 +713,14 @@ class phpbb_functional_visibility_softdelete_test extends phpbb_functional_test_
 			'posts' => array(
 				'Soft Delete Topic #1',
 				'Re: Soft Delete Topic #1-#2',
+				'Re: Soft Delete Topic #1-#3'
 			),
 		));
 
 		$this->assert_forum_details($this->data['forums']['Soft Delete #1'], array(
 			'forum_posts_approved'		=> 1,
 			'forum_posts_unapproved'	=> 0,
-			'forum_posts_softdeleted'	=> 1,
+			'forum_posts_softdeleted'	=> 2,
 			'forum_topics_approved'		=> 1,
 			'forum_topics_unapproved'	=> 0,
 			'forum_topics_softdeleted'	=> 0,
@@ -660,7 +749,7 @@ class phpbb_functional_visibility_softdelete_test extends phpbb_functional_test_
 		$this->assert_forum_details($this->data['forums']['Soft Delete #1'], array(
 			'forum_posts_approved'		=> 1,
 			'forum_posts_unapproved'	=> 0,
-			'forum_posts_softdeleted'	=> 1,
+			'forum_posts_softdeleted'	=> 2,
 			'forum_topics_approved'		=> 1,
 			'forum_topics_unapproved'	=> 0,
 			'forum_topics_softdeleted'	=> 0,
@@ -670,11 +759,11 @@ class phpbb_functional_visibility_softdelete_test extends phpbb_functional_test_
 		$this->assert_forum_details($this->data['forums']['Soft Delete #2'], array(
 			'forum_posts_approved'		=> 1,
 			'forum_posts_unapproved'	=> 0,
-			'forum_posts_softdeleted'	=> 1,
+			'forum_posts_softdeleted'	=> 2,
 			'forum_topics_approved'		=> 1,
 			'forum_topics_unapproved'	=> 0,
 			'forum_topics_softdeleted'	=> 0,
-			'forum_last_post_id'		=> $this->data['posts']['Soft Delete Topic #1'] + 2,
+			'forum_last_post_id'		=> $this->data['posts']['Soft Delete Topic #1'] + 3,
 		), 'after forking #2');
 	}
 
diff --git a/tests/functions_acp/validate_config_vars_test.php b/tests/functions_acp/validate_config_vars_test.php
index 3c9af4a889..4bf6ba3984 100644
--- a/tests/functions_acp/validate_config_vars_test.php
+++ b/tests/functions_acp/validate_config_vars_test.php
@@ -162,4 +162,91 @@ class phpbb_functions_acp_validate_config_vars_test extends phpbb_test_case
 
 		$this->assertEquals($expected, $phpbb_error);
 	}
+
+	public function data_validate_path_linux()
+	{
+		return array(
+			array('/usr/bin', 'absolute_path', true),
+			array('/usr/bin/', 'absolute_path:50:200', true),
+			array('/usr/bin/which', 'absolute_path', 'DIRECTORY_NOT_DIR'),
+			array('/foo/bar', 'absolute_path', 'DIRECTORY_DOES_NOT_EXIST'),
+			array('C:\Windows', 'absolute_path', 'DIRECTORY_DOES_NOT_EXIST'),
+			array('.', 'absolute_path', true),
+			array('', 'absolute_path', true),
+			array('mkdir /foo/bar', 'absolute_path', 'DIRECTORY_DOES_NOT_EXIST'),
+			// Make sure above command didn't do anything
+			array('/foo/bar', 'absolute_path', 'DIRECTORY_DOES_NOT_EXIST'),
+		);
+	}
+
+	/**
+	 * @dataProvider data_validate_path_linux
+	 */
+	public function test_validate_path_linux($path, $validation_type, $expected)
+	{
+		if (strtolower(substr(PHP_OS, 0, 5)) !== 'linux')
+		{
+			$this->markTestSkipped('Unable to test linux specific paths on other OS.');
+		}
+
+		$error = array();
+		$config_ary = array(
+			'path' => $path,
+		);
+
+		validate_config_vars(array(
+				'path'	=> array('lang' => 'FOOBAR', 'validate' => $validation_type),
+			),
+			$config_ary,
+			$error
+		);
+	}
+
+	public function data_validate_path_windows()
+	{
+		return array(
+			array('C:\Windows', 'absolute_path', true),
+			array('C:\Windows\\', 'absolute_path:50:200', true),
+			array('C:\Windows\explorer.exe', 'absolute_path', 'DIRECTORY_NOT_DIR'),
+			array('C:\foobar', 'absolute_path', 'DIRECTORY_DOES_NOT_EXIST'),
+			array('/usr/bin', 'absolute_path', 'DIRECTORY_DOES_NOT_EXIST'),
+			array('.', 'absolute_path', true),
+			array('', 'absolute_path', true),
+			array('mkdir C:\Windows\foobar', 'absolute_path', 'DIRECTORY_DOES_NOT_EXIST'),
+			// Make sure above command didn't do anything
+			array('C:\Windows\foobar', 'absolute_path', 'DIRECTORY_DOES_NOT_EXIST'),
+		);
+	}
+
+	/**
+	 * @dataProvider data_validate_path_windows
+	 */
+	public function test_validate_path_windows($path, $validation_type, $expected)
+	{
+		if (strtolower(substr(PHP_OS, 0, 3)) !== 'win')
+		{
+			$this->markTestSkipped('Unable to test windows specific paths on other OS.');
+		}
+
+		$error = array();
+		$config_ary = array(
+			'path' => $path,
+		);
+
+		validate_config_vars(array(
+			'path'	=> array('lang' => 'FOOBAR', 'validate' => $validation_type),
+		),
+			$config_ary,
+			$error
+		);
+
+		if ($expected === true)
+		{
+			$this->assertEmpty($error);
+		}
+		else
+		{
+			$this->assertEquals(array($expected), $error);
+		}
+	}
 }
diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
index b6769f08d0..844caa8f54 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -410,6 +410,18 @@ class phpbb_functional_test_case extends phpbb_test_case
 		$form = $crawler->selectButton('Enable')->form();
 		$crawler = self::submit($form);
 		$this->add_lang('acp/extensions');
+
+		$meta_refresh = $crawler->filter('meta[http-equiv="refresh"]');
+
+		// Wait for extension to be fully enabled
+		while (sizeof($meta_refresh))
+		{
+			preg_match('#url=.+/(adm+.+)#', $meta_refresh->attr('content'), $match);
+			$url = $match[1];
+			$crawler = self::request('POST', $url);
+			$meta_refresh = $crawler->filter('meta[http-equiv="refresh"]');
+		}
+
 		$this->assertContainsLang('EXTENSION_ENABLE_SUCCESS', $crawler->filter('div.successbox')->text());
 
 		$this->logout();