makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/10620] Fixed functional tests to account for newlines

Browse source 
PHPBB3-10620
This commit is contained in:
JoshyPHP 2015-06-24 23:42:36 +02:00
parent 5a55ce3f68
commit 1f6b9bc048
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tests/functional/posting_test.php
View file

@ -75,7 +75,7 @@ class phpbb_functional_posting_test extends phpbb_functional_test_case
public function test_quote() public function test_quote()
{ {
$text = 'Test post </textarea>"\' &&amp;amp;'; $text = 'Test post </textarea>"\' &&amp;amp;';
$expected = '([quote=admin[^]]*\\]' . preg_quote($text) . '\\[/quote\\])'; $expected = "(\\[quote=admin[^\\]]*\\]\n" . preg_quote($text) . "\n\\[/quote\\])";
$this->login(); $this->login();
$topic = $this->create_topic(2, 'Test Topic 1', 'Test topic'); $topic = $this->create_topic(2, 'Test Topic 1', 'Test topic');
@ -110,7 +110,7 @@ class phpbb_functional_posting_test extends phpbb_functional_test_case
$this->set_quote_depth($quote_depth); $this->set_quote_depth($quote_depth);
$crawler = self::request('GET', $quote_url); $crawler = self::request('GET', $quote_url);
$this->assertRegexp( $this->assertRegexp(
'(\\[quote=admin[^]]*\\]' . preg_quote($expected_text) . '\\[/quote\\])', "(\\[quote=admin[^\\]]*\\]\n?" . preg_quote($expected_text) . "\n?\\[/quote\\])",
$crawler->filter('textarea#message')->text() $crawler->filter('textarea#message')->text()
); );
} }

4
tests/functional/private_messages_test.php
View file

@ -85,7 +85,7 @@ class phpbb_functional_private_messages_test extends phpbb_functional_test_case
public function test_quote_pm() public function test_quote_pm()
{ {
$text = 'This is a test private message sent by the testing framework.'; $text = 'This is a test private message sent by the testing framework.';
$expected = '(\\[quote=admin time=\\d+ user_id=2\\]' . $text . '\\[/quote\\])'; $expected = "(\\[quote=admin time=\\d+ user_id=2\\]\n" . $text . "\n\\[/quote\\])";
$this->login(); $this->login();
$message_id = $this->create_private_message('Test', $text, array(2)); $message_id = $this->create_private_message('Test', $text, array(2));
@ -98,7 +98,7 @@ class phpbb_functional_private_messages_test extends phpbb_functional_test_case
public function test_quote_forward() public function test_quote_forward()
{ {
$text = 'This is a test private message sent by the testing framework.'; $text = 'This is a test private message sent by the testing framework.';
$expected = '[quote=admin]' . $text . '[/quote]'; $expected = "[quote=admin]\n" . $text . "\n[/quote]";
$this->login(); $this->login();
$message_id = $this->create_private_message('Test', $text, array(2)); $message_id = $this->create_private_message('Test', $text, array(2));