aboutsummaryrefslogtreecommitdiffstats
path: root/tests/text_formatter/s9e
diff options
context:
space:
mode:
authorJoshyPHP <s9e.dev@gmail.com>2015-02-19 06:05:39 +0100
committerJoshyPHP <s9e.dev@gmail.com>2015-04-02 19:16:01 +0200
commitf721b85a7835c18459b310e4db74cc0f654b05ec (patch)
treeed8f9334a79e5fe24ebe3ca96bf3fb30b18bd446 /tests/text_formatter/s9e
parent6578e1c6ec7172016fbfa375dd2fce5cb20f3ce1 (diff)
downloadforums-f721b85a7835c18459b310e4db74cc0f654b05ec.tar
forums-f721b85a7835c18459b310e4db74cc0f654b05ec.tar.gz
forums-f721b85a7835c18459b310e4db74cc0f654b05ec.tar.bz2
forums-f721b85a7835c18459b310e4db74cc0f654b05ec.tar.xz
forums-f721b85a7835c18459b310e4db74cc0f654b05ec.zip
[ticket/11768] Replaced the Censor plugin
...with something that is run at rendering time. PHPBB3-11768
Diffstat (limited to 'tests/text_formatter/s9e')
-rw-r--r--tests/text_formatter/s9e/parser_test.php8
-rw-r--r--tests/text_formatter/s9e/renderer_test.php12
2 files changed, 6 insertions, 14 deletions
diff --git a/tests/text_formatter/s9e/parser_test.php b/tests/text_formatter/s9e/parser_test.php
index f422e5425a..09af6c22ad 100644
--- a/tests/text_formatter/s9e/parser_test.php
+++ b/tests/text_formatter/s9e/parser_test.php
@@ -139,10 +139,6 @@ class phpbb_textformatter_s9e_parser_test extends phpbb_test_case
'disablePlugin', 'BBCodes'
),
array(
- 'disable_censor', null,
- 'disablePlugin', 'Censor'
- ),
- array(
'disable_magic_url', null,
'disablePlugin', array('Autoemail', 'Autolink')
),
@@ -159,10 +155,6 @@ class phpbb_textformatter_s9e_parser_test extends phpbb_test_case
'enablePlugin', 'BBCodes'
),
array(
- 'enable_censor', null,
- 'enablePlugin', 'Censor'
- ),
- array(
'enable_magic_url', null,
'enablePlugin', array('Autoemail', 'Autolink')
),
diff --git a/tests/text_formatter/s9e/renderer_test.php b/tests/text_formatter/s9e/renderer_test.php
index 464bcf8eed..fbf17c8f68 100644
--- a/tests/text_formatter/s9e/renderer_test.php
+++ b/tests/text_formatter/s9e/renderer_test.php
@@ -93,12 +93,12 @@ class phpbb_textformatter_s9e_renderer_test extends phpbb_test_case
{
return array(
array(
- '<r><CENSOR with="banana">apple</CENSOR></r>',
+ '<t>apple</t>',
'banana',
array('set_viewcensors' => true)
),
array(
- '<r><CENSOR with="banana">apple</CENSOR></r>',
+ '<t>apple</t>',
'apple',
array('set_viewcensors' => false)
),
@@ -146,11 +146,11 @@ class phpbb_textformatter_s9e_renderer_test extends phpbb_test_case
{
return array(
array(
- '<r><CENSOR with="banana">apple</CENSOR></r>',
+ '<t>apple</t>',
'banana'
),
array(
- '<r><CENSOR with="banana">apple</CENSOR></r>',
+ '<t>apple</t>',
'banana',
function ($phpbb_container)
{
@@ -161,7 +161,7 @@ class phpbb_textformatter_s9e_renderer_test extends phpbb_test_case
}
),
array(
- '<r><CENSOR with="banana">apple</CENSOR></r>',
+ '<t>apple</t>',
'banana',
function ($phpbb_container)
{
@@ -175,7 +175,7 @@ class phpbb_textformatter_s9e_renderer_test extends phpbb_test_case
}
),
array(
- '<r><CENSOR with="banana">apple</CENSOR></r>',
+ '<t>apple</t>',
'apple',
function ($phpbb_container, $test)
{