4 files changed, 176 insertions, 5 deletions
diff --git a/tests/functional/browse_test.php b/tests/functional/browse_test.php
index b9e74a280f..4f28879687 100644
--- a/tests/functional/browse_test.php
+++ b/tests/functional/browse_test.php
@@ -34,6 +34,18 @@ class phpbb_functional_browse_test extends phpbb_functional_test_case
 		$this->assertGreaterThan(0, $crawler->filter('.postbody')->count());
 	}
 
+	public function test_help_faq()
+	{
+		$crawler = self::request('GET', 'app.php/help/faq');
+		$this->assertGreaterThan(0, $crawler->filter('h2.faq-title')->count());
+	}
+
+	public function test_help_bbcode()
+	{
+		$crawler = self::request('GET', 'app.php/help/bbcode');
+		$this->assertGreaterThan(0, $crawler->filter('h2.faq-title')->count());
+	}
+
 	public function test_feed()
 	{
 		$crawler = self::request('GET', 'feed.php', array(), false);
diff --git a/tests/functional/extension_module_test.php b/tests/functional/extension_module_test.php
index ee084720e4..95107665cd 100644
--- a/tests/functional/extension_module_test.php
+++ b/tests/functional/extension_module_test.php
@@ -49,8 +49,9 @@ class phpbb_functional_extension_module_test extends phpbb_functional_test_case
 		$this->phpbb_extension_manager = $this->get_extension_manager();
 		$this->phpbb_extension_manager->enable('foo/bar');
 
-		$modules = new acp_modules();
 		$db = $this->get_db();
+		$cache = $this->get_cache_driver();
+		$modules = new \phpbb\module\module_manager($cache, $db, $this->phpbb_extension_manager, MODULES_TABLE, dirname(__FILE__) . '/../../phpBB/', 'php');
 
 		$sql = 'SELECT module_id
 			FROM ' . MODULES_TABLE . "
@@ -70,7 +71,7 @@ class phpbb_functional_extension_module_test extends phpbb_functional_test_case
 			'module_mode'		=> '',
 			'module_auth'		=> '',
 		);
-		$modules->update_module_data($parent_data, true);
+		$modules->update_module_data($parent_data);
 
 		$module_data = array(
 			'module_basename'	=> 'foo\\bar\\acp\\main_module',
@@ -82,7 +83,7 @@ class phpbb_functional_extension_module_test extends phpbb_functional_test_case
 			'module_mode'		=> 'mode',
 			'module_auth'		=> '',
 		);
-		$modules->update_module_data($module_data, true);
+		$modules->update_module_data($module_data);
 
 		$parent_data = array(
 			'module_basename'	=> '',
@@ -94,7 +95,7 @@ class phpbb_functional_extension_module_test extends phpbb_functional_test_case
 			'module_mode'		=> '',
 			'module_auth'		=> '',
 		);
-		$modules->update_module_data($parent_data, true);
+		$modules->update_module_data($parent_data);
 
 		$module_data = array(
 			'module_basename'	=> 'foo\\bar\\ucp\\main_module',
@@ -106,7 +107,7 @@ class phpbb_functional_extension_module_test extends phpbb_functional_test_case
 			'module_mode'		=> 'mode',
 			'module_auth'		=> '',
 		);
-		$modules->update_module_data($module_data, true);
+		$modules->update_module_data($module_data);
 
 		$this->purge_cache();
 	}
diff --git a/tests/functional/posting_test.php b/tests/functional/posting_test.php
index 7acf375c5d..ccfeb10deb 100644
--- a/tests/functional/posting_test.php
+++ b/tests/functional/posting_test.php
@@ -71,4 +71,135 @@ class phpbb_functional_posting_test extends phpbb_functional_test_case
 		$crawler = self::request('GET', "viewtopic.php?t={$post['topic_id']}&sid={$this->sid}");
 		$this->assertContains('&#128512;', $crawler->text());
 	}
+
+	public function test_quote()
+	{
+		$text     = 'Test post </textarea>"\' &&amp;amp;';
+		$expected = '[quote="admin"]' . $text . '[/quote]';
+
+		$this->login();
+		$topic = $this->create_topic(2, 'Test Topic 1', 'Test topic');
+		$post  = $this->create_post(2, $topic['topic_id'], 'Re: Test Topic 1', $text);
+
+		$crawler = self::request('GET', "posting.php?mode=quote&f=2&t={$post['topic_id']}&p={$post['post_id']}&sid={$this->sid}");
+
+		$this->assertContains($expected, $crawler->filter('textarea#message')->text());
+	}
+
+	/**
+	* @testdox max_quote_depth is applied to the text populating the posting form
+	*/
+	public function test_quote_depth_form()
+	{
+		$text = '0[quote]1[quote]2[/quote]1[/quote]0';
+		$expected = array(
+			0 => '[quote="admin"]0[quote]1[quote]2[/quote]1[/quote]0[/quote]',
+			1 => '[quote="admin"]00[/quote]',
+			2 => '[quote="admin"]0[quote]11[/quote]0[/quote]',
+			3 => '[quote="admin"]0[quote]1[quote]2[/quote]1[/quote]0[/quote]',
+		);
+
+		$this->login();
+		$topic = $this->create_topic(2, 'Test Topic 1', 'Test topic');
+		$post  = $this->create_post(2, $topic['topic_id'], 'Re: Test Topic 1', $text);
+		$quote_url = "posting.php?mode=quote&f=2&t={$post['topic_id']}&p={$post['post_id']}&sid={$this->sid}";
+
+		$this->admin_login();
+		foreach ($expected as $quote_depth => $expected_text)
+		{
+			$this->set_quote_depth($quote_depth);
+			$crawler = self::request('GET', $quote_url);
+			$this->assertContains($expected_text, $crawler->filter('textarea#message')->text());
+		}
+	}
+
+	/**
+	* @testdox max_quote_depth is applied to the submitted text
+	*/
+	public function test_quote_depth_submit()
+	{
+		$text = 'depth:0[quote]depth:1[quote]depth:2[quote]depth:3[/quote][/quote][/quote]';
+		$contains = array(
+			0 => array('depth:0', 'depth:1', 'depth:2', 'depth:3'),
+			1 => array('depth:0', 'depth:1'),
+			2 => array('depth:0', 'depth:1', 'depth:2'),
+			3 => array('depth:0', 'depth:1', 'depth:2', 'depth:3'),
+		);
+		$not_contains = array(
+			0 => array(),
+			1 => array('depth:2', 'depth:3'),
+			2 => array('depth:3'),
+			3 => array(),
+		);
+
+		$this->login();
+		$this->admin_login();
+		$topic = $this->create_topic(2, 'Test Topic 1', 'Test topic');
+
+		for ($quote_depth = 0; $quote_depth <= 2; ++$quote_depth)
+		{
+			$this->set_quote_depth($quote_depth);
+
+			$post = $this->create_post(2, $topic['topic_id'], 'Re: Test Topic 1', $text);
+			$url  = "viewtopic.php?p={$post['post_id']}&sid={$this->sid}";
+
+			$crawler = self::request('GET', $url);
+			$text_content = $crawler->filter('#p' . $post['post_id'])->text();
+			foreach ($contains[$quote_depth] as $contains_text)
+			{
+				$this->assertContains($contains_text, $text_content);
+			}
+			foreach ($not_contains[$quote_depth] as $not_contains_text)
+			{
+				$this->assertNotContains($not_contains_text, $text_content);
+			}
+		}
+	}
+
+	protected function set_quote_depth($depth)
+	{
+		$crawler = self::request('GET', 'adm/index.php?sid=' . $this->sid . '&i=acp_board&mode=post');
+		$form = $crawler->selectButton('Submit')->form();
+		$values = $form->getValues();
+		$values['config[max_quote_depth]'] = $depth;
+		$form->setValues($values);
+		$crawler = self::submit($form);
+		$this->assertEquals(1, $crawler->filter('.successbox')->count());
+	}
+
+	public function test_ticket_8420()
+	{
+		$text = '[b][url=http://example.org] :arrow: here[/url][/b]';
+
+		$this->login();
+		$crawler = self::request('GET', 'posting.php?mode=post&f=2');
+		$form = $crawler->selectButton('Preview')->form(array(
+			'subject' => 'Test subject',
+			'message' => $text
+		));
+		$crawler = self::submit($form);
+		$this->assertEquals($text, $crawler->filter('#message')->text());
+	}
+
+	public function test_old_signature_in_preview()
+	{
+		$sql = 'UPDATE ' . USERS_TABLE . "
+			SET user_sig = '[b:2u8sdcwb]My signature[/b:2u8sdcwb]',
+				user_sig_bbcode_uid = '2u8sdcwb',
+				user_sig_bbcode_bitfield = 'QA=='
+			WHERE user_id = 2";
+		$this->get_db()->sql_query($sql);
+
+		$this->login();
+		$crawler = self::request('GET', 'posting.php?mode=post&f=2');
+		$form = $crawler->selectButton('Preview')->form(array(
+			'subject' => 'Test subject',
+			'message' => 'My post',
+		));
+		$crawler = self::submit($form);
+		$this->assertContains(
+			'<span style="font-weight: bold">My signature</span>',
+			$crawler->filter('#preview .signature')->html()
+		);
+	}
 }
diff --git a/tests/functional/private_messages_test.php b/tests/functional/private_messages_test.php
index 1f6dc3a979..be584c20c1 100644
--- a/tests/functional/private_messages_test.php
+++ b/tests/functional/private_messages_test.php
@@ -66,4 +66,31 @@ class phpbb_functional_private_messages_test extends phpbb_functional_test_case
 		$crawler = self::submit($form);
 		$this->assertContains($this->lang('CONFIG_UPDATED'), $crawler->filter('.successbox')->text());
 	}
+
+	public function test_quote_post()
+	{
+		$text     = 'Test post';
+		$expected = '[quote="admin"]' . $text . '[/quote]';
+
+		$this->login();
+		$topic = $this->create_topic(2, 'Test Topic 1', 'Test topic');
+		$post  = $this->create_post(2, $topic['topic_id'], 'Re: Test Topic 1', $text);
+
+		$crawler = self::request('GET', 'ucp.php?i=pm&mode=compose&action=quotepost&p=' . $post['post_id'] . '&sid=' . $this->sid);
+
+		$this->assertContains($expected, $crawler->filter('textarea#message')->text());
+	}
+
+	public function test_quote_forward()
+	{
+		$text     = 'This is a test private message sent by the testing framework.';
+		$expected = "[quote=\"admin\"]\n" . $text . "\n[/quote]";
+
+		$this->login();
+		$message_id = $this->create_private_message('Test', $text, array(2));
+
+		$crawler = self::request('GET', 'ucp.php?i=pm&mode=compose&action=forward&f=0&p=' . $message_id . '&sid=' . $this->sid);
+
+		$this->assertContains($expected, $crawler->filter('textarea#message')->text());
+	}
 }