aboutsummaryrefslogtreecommitdiffstats
path: root/tests/functional
diff options
context:
space:
mode:
authorJoshyPHP <s9e.dev@gmail.com>2015-06-24 22:20:39 +0200
committerJoshyPHP <s9e.dev@gmail.com>2015-06-25 03:11:58 +0200
commit4f1b25706f6a1ae6eb1c6c60ef27b42bb7ac4b40 (patch)
tree8d99b3692cec947962c5abfd9e287ba176736d58 /tests/functional
parent129b3375ae873b3e6e947e3c5f47897bc4f9c572 (diff)
downloadforums-4f1b25706f6a1ae6eb1c6c60ef27b42bb7ac4b40.tar
forums-4f1b25706f6a1ae6eb1c6c60ef27b42bb7ac4b40.tar.gz
forums-4f1b25706f6a1ae6eb1c6c60ef27b42bb7ac4b40.tar.bz2
forums-4f1b25706f6a1ae6eb1c6c60ef27b42bb7ac4b40.tar.xz
forums-4f1b25706f6a1ae6eb1c6c60ef27b42bb7ac4b40.zip
[ticket/10620] Removed extraneous quotes from attribute values
PHPBB3-10620
Diffstat (limited to 'tests/functional')
-rw-r--r--tests/functional/posting_test.php4
-rw-r--r--tests/functional/private_messages_test.php6
2 files changed, 5 insertions, 5 deletions
diff --git a/tests/functional/posting_test.php b/tests/functional/posting_test.php
index d9e6cc5ab3..4f4ecfef45 100644
--- a/tests/functional/posting_test.php
+++ b/tests/functional/posting_test.php
@@ -75,7 +75,7 @@ class phpbb_functional_posting_test extends phpbb_functional_test_case
public function test_quote()
{
$text = 'Test post </textarea>"\' &&amp;amp;';
- $expected = '([quote="admin"[^]]*\\]' . preg_quote($text) . '\\[/quote\\])';
+ $expected = '([quote=admin[^]]*\\]' . preg_quote($text) . '\\[/quote\\])';
$this->login();
$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);
$crawler = self::request('GET', $quote_url);
$this->assertRegexp(
- '(\\[quote="admin"[^]]*\\]' . preg_quote($expected_text) . '\\[/quote\\])',
+ '(\\[quote=admin[^]]*\\]' . preg_quote($expected_text) . '\\[/quote\\])',
$crawler->filter('textarea#message')->text()
);
}
diff --git a/tests/functional/private_messages_test.php b/tests/functional/private_messages_test.php
index 9bfb5bc7ad..a7d1a29e80 100644
--- a/tests/functional/private_messages_test.php
+++ b/tests/functional/private_messages_test.php
@@ -75,7 +75,7 @@ class phpbb_functional_private_messages_test extends phpbb_functional_test_case
$topic = $this->create_topic(2, 'Test Topic 1', 'Test topic');
$post = $this->create_post(2, $topic['topic_id'], 'Re: Test Topic 1', $text);
- $expected = '(\\[quote="admin" post_id="' . $post['post_id'] . '" time="\\d+" user_id="2"\\]' . $text . '\\[/quote\\])';
+ $expected = '(\\[quote=admin post_id=' . $post['post_id'] . ' time=\\d+ user_id=2\\]' . $text . '\\[/quote\\])';
$crawler = self::request('GET', 'ucp.php?i=pm&mode=compose&action=quotepost&p=' . $post['post_id'] . '&sid=' . $this->sid);
@@ -85,7 +85,7 @@ class phpbb_functional_private_messages_test extends phpbb_functional_test_case
public function test_quote_pm()
{
$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\\]' . $text . '\\[/quote\\])';
$this->login();
$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()
{
$text = 'This is a test private message sent by the testing framework.';
- $expected = "[quote=\"admin\"]\n" . $text . "\n[/quote]";
+ $expected = '[quote=admin]' . $text . '[/quote]';
$this->login();
$message_id = $this->create_private_message('Test', $text, array(2));