Merge pull request #2566 from marc1706/ticket/11711

[ticket/11711] Inform user of unsupported characters while posting

* marc1706/ticket/11711:
  [ticket/11711] Improve coding and comments of character check
  [ticket/11711] Reduce size of tests and also test topic titles
  [ticket/11711] Improve checks for unsupported characters and check subject
  [ticket/11711] Inform user of unsupported characters while posting

2 files changed, 32 insertions, 1 deletions

diff --git a/tests/functional/posting_test.php b/tests/functional/posting_test.php
index 2611ef7bf1..fd802eed45 100644
--- a/tests/functional/posting_test.php
+++ b/tests/functional/posting_test.php
@@ -36,4 +36,27 @@ class phpbb_functional_posting_test extends phpbb_functional_test_case
 		$crawler = self::request('GET', "posting.php?mode=quote&f=2&t={$post2['topic_id']}&p={$post2['post_id']}&sid={$this->sid}");
 		$this->assertContains('This is a test post posted by the testing framework.', $crawler->filter('html')->text());
 	}
+
+	public function test_unsupported_characters()
+	{
+		$this->login();
+
+		$this->add_lang('posting');
+
+		self::create_post(2,
+			1,
+			'Unsupported characters',
+			"This is a test with these weird characters: \xF0\x9F\x88\xB3 \xF0\x9F\x9A\xB6",
+			array(),
+			'Your message contains the following unsupported characters'
+		);
+
+		self::create_post(2,
+			1,
+			"Unsupported: \xF0\x9F\x88\xB3 \xF0\x9F\x9A\xB6",
+			'This is a test with emoji characters in the topic title.',
+			array(),
+			'Your subject contains the following unsupported characters'
+		);
+	}
 }
diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
index e4504a5f8d..fde6a6a4ff 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -1076,9 +1076,17 @@ class phpbb_functional_test_case extends phpbb_test_case
 
 		if ($expected !== '')
 		{
-			$this->assertContainsLang($expected, $crawler->filter('html')->text());
+			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(