2 files changed, 79 insertions, 12 deletions
diff --git a/tests/functional/feed_test.php b/tests/functional/feed_test.php
index b6287bf10f..86d3930a7b 100644
--- a/tests/functional/feed_test.php
+++ b/tests/functional/feed_test.php
@@ -1195,7 +1195,6 @@ class phpbb_functional_feed_test extends phpbb_functional_test_case
 
 	public function test_create_missing_attachment_post()
 	{
-		$this->markTestIncomplete('Missing attachments in posts/topics are not marked in feeds yet, see PHPBB3-12418');
 		$this->login();
 		$this->load_ids(array(
 			'forums' => array(
@@ -1216,7 +1215,6 @@ class phpbb_functional_feed_test extends phpbb_functional_test_case
 
 	public function test_feeds_missing_attachment_admin()
 	{
-		$this->markTestIncomplete('Missing attachments in posts/topics are not marked in feeds yet, see PHPBB3-12418');
 		$this->load_ids(array(
 			'forums' => array(
 				'Feeds #1',
@@ -1252,7 +1250,7 @@ class phpbb_functional_feed_test extends phpbb_functional_test_case
 			),
 			'overall' => array(
 				array(
-					'nb_entries' => 13,
+					'nb_entries' => 12,
 					'contents' => array(
 						1 => 'Attachment #0',
 					),
@@ -1260,12 +1258,12 @@ class phpbb_functional_feed_test extends phpbb_functional_test_case
 			),
 			'topics' => array(
 				array(
-					'nb_entries' => 9,
+					'nb_entries' => 8,
 					'attachments' => array(
 						1 => array( // First entry
 							array( // First attachment to fetch
 								'id' => $this->data['attachments'][$this->data['posts']['Feeds #1 - Topic #3']][0],
-								'displayed' => false,
+								'displayed' => true,
 							),
 						),
 					),
@@ -1273,12 +1271,12 @@ class phpbb_functional_feed_test extends phpbb_functional_test_case
 			),
 			'topics_new' => array(
 				array(
-					'nb_entries' => 9,
+					'nb_entries' => 8,
 					'attachments' => array(
 						1 => array( // First entry
 							array( // First attachment to fetch
 								'id' => $this->data['attachments'][$this->data['posts']['Feeds #1 - Topic #3']][0],
-								'displayed' => false,
+								'displayed' => true,
 							),
 						),
 					),
@@ -1286,7 +1284,7 @@ class phpbb_functional_feed_test extends phpbb_functional_test_case
 			),
 			'topics_active' => array(
 				array(
-					'nb_entries' => 9,
+					'nb_entries' => 8,
 					'contents' => array(
 						1 => 'Attachment #0',
 					),
@@ -1396,13 +1394,12 @@ class phpbb_functional_feed_test extends phpbb_functional_test_case
 						if ($attachment['displayed'])
 						{
 							$this->assertContains($url, $content, "Tested feed : 'feed.php{$params}'");
-							// $this->assertNotContains($string, $content, "Tested feed : 'feed.php{$params}'");
+							$this->assertNotContains($string, $content, "Tested feed : 'feed.php{$params}'");
 						}
 						else
 						{
-							// Disabled until PHPBB3-12421 is fixed and merged
-							// $this->assertContains($string, $content, "Tested feed : 'feed.php{$params}'");
-							// $this->assertNotContains($url, $content, "Tested feed : 'feed.php{$params}'");
+							$this->assertContains($string, $content, "Tested feed : 'feed.php{$params}'");
+							$this->assertNotContains($url, $content, "Tested feed : 'feed.php{$params}'");
 						}
 					}
 				}
diff --git a/tests/functional/ucp_allow_pm_test.php b/tests/functional/ucp_allow_pm_test.php
new file mode 100644
index 0000000000..b433ec8e75
--- /dev/null
+++ b/tests/functional/ucp_allow_pm_test.php
@@ -0,0 +1,70 @@
+<?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_ucp_allow_pm_test extends phpbb_functional_test_case
+{
+	static protected $data = array();
+
+	public function __construct()
+	{
+		parent::__construct();
+
+		$this->backupStaticAttributesBlacklist += array(
+			'phpbb_functional_ucp_allow_pm_test' => array('data'),
+		);
+	}
+
+	// user A sends a PM to user B where B accepts PM
+	public function test_enabled_pm_user_to_user()
+	{
+		// setup
+		$this->create_user('test_ucp_allow_pm_sender');
+		$this->login('test_ucp_allow_pm_sender');
+		self::$data['recipient_id'] = $this->create_user('test_ucp_allow_pm_recipient');
+		self::$data['pm_url'] = "ucp.php?i=pm&mode=compose&u=" . (int) self::$data['recipient_id'] . "&sid={$this->sid}";
+
+		// the actual test
+		$this->set_user_allow_pm(self::$data['recipient_id'], 1);
+		$crawler = self::request('GET', self::$data['pm_url']);
+		$this->assertNotContainsLang('PM_USERS_REMOVED_NO_PM', $crawler->filter('html')->text());
+	}
+
+	// user A sends a PM to user B where B does not accept PM
+	public function test_disabled_pm_user_to_user()
+	{
+		$this->login('test_ucp_allow_pm_sender');
+		$this->set_user_allow_pm(self::$data['recipient_id'], 0);
+		$crawler = self::request('GET', self::$data['pm_url']);
+		$this->assertContainsLang('PM_USERS_REMOVED_NO_PM', $crawler->filter('.error')->text());
+	}
+
+
+	// An admin sends a PM to user B where B does not accept PM, but cannot
+	// ignore a PM from an admin
+	public function test_disabled_pm_admin_to_user()
+	{
+		$this->login();
+		$crawler = self::request('GET', self::$data['pm_url']);
+		$this->assertNotContainsLang('PM_USERS_REMOVED_NO_PM', $crawler->filter('html')->text());
+	}
+
+	// enable or disable PM for a user, like from ucp
+	protected function set_user_allow_pm($user_id, $allow)
+	{
+		$db = $this->get_db();
+		$sql = 'UPDATE ' . USERS_TABLE . "
+			SET user_allow_pm = " . $allow . "
+			WHERE user_id = " . $user_id;
+		$result = $db->sql_query($sql);
+		$db->sql_freeresult($result);
+	}
+}