summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Almdal <tnalmdal@shaw.ca>2009-09-03 01:05:03 -0700
committerTim Almdal <tnalmdal@shaw.ca>2009-09-03 01:05:03 -0700
commit33bcf11e2714f727f16136a1c09926cd5b6c8212 (patch)
tree44b0dd84dede1a919e59b4065d37170b626cb77b
parent3dc7e2e78cab117726385e29d47bb1487b5d755d (diff)
Change the Html_Helper and SafeString tests to change the expeced results based on whether HtmlPurifier module is installed or not
-rw-r--r--modules/gallery/tests/Html_Helper_Test.php5
-rw-r--r--modules/gallery/tests/SafeString_Test.php4
2 files changed, 6 insertions, 3 deletions
diff --git a/modules/gallery/tests/Html_Helper_Test.php b/modules/gallery/tests/Html_Helper_Test.php
index bfce6dcf..8f665e0c 100644
--- a/modules/gallery/tests/Html_Helper_Test.php
+++ b/modules/gallery/tests/Html_Helper_Test.php
@@ -27,8 +27,9 @@ class Html_Helper_Test extends Unit_Test_Case {
public function purify_test() {
$safe_string = html::purify("hello <p >world</p>");
- $this->assert_equal("hello <p>world</p>",
- $safe_string);
+ $expected =
+ module::is_active("htmlpurifier") ? "hello <p>world</p>" : "hello &lt;p &gt;world&lt;/p&gt;";
+ $this->assert_equal($expected, $safe_string->unescaped());
$this->assert_true($safe_string instanceof SafeString);
}
diff --git a/modules/gallery/tests/SafeString_Test.php b/modules/gallery/tests/SafeString_Test.php
index 0895b7dd..37a1865f 100644
--- a/modules/gallery/tests/SafeString_Test.php
+++ b/modules/gallery/tests/SafeString_Test.php
@@ -91,7 +91,9 @@ class SafeString_Test extends Unit_Test_Case {
public function purify_test() {
$safe_string = SafeString::purify("hello <p >world</p>");
- $this->assert_equal("hello <p>world</p>", $safe_string);
+ $expected =
+ module::is_active("htmlpurifier") ? "hello <p>world</p>" : "hello &lt;p &gt;world&lt;/p&gt;";
+ $this->assert_equal($expected, $safe_string->unescaped());
}
public function of_fluid_api_test() {