From ecfaed571b2c38f4bcc2b6a0fa39fba15a5126ce Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Fri, 11 Nov 2011 10:04:45 -0500
Subject: [PATCH] - Apply fixes fom trunk up to r5414

---
 tests/mailfunc.php |   25 ++++++++++++++++++++++++-
 1 files changed, 24 insertions(+), 1 deletions(-)

diff --git a/tests/mailfunc.php b/tests/mailfunc.php
index 5bf77b1..6dc60ba 100644
--- a/tests/mailfunc.php
+++ b/tests/mailfunc.php
@@ -19,7 +19,7 @@
     $RCMAIL->imap_init(false);
     $IMAP = $RCMAIL->imap;
     
-    require_once 'steps/mail/func.inc';
+    require_once INSTALL_PATH . 'program/steps/mail/func.inc';
     
     $GLOBALS['EMAIL_ADDRESS_PATTERN'] = $EMAIL_ADDRESS_PATTERN;
   }
@@ -100,6 +100,17 @@
   }
 
   /**
+   * Test washtml class on non-unicode characters (#1487813)
+   */
+  function test_washtml_utf8()
+  {
+    $part = $this->get_html_part('src/invalidchars.html');
+    $washed = rcmail_print_body($part);
+
+    $this->assertPattern('/<p>сОЌвПл<\/p>/', $washed, "Remove non-unicode characters from HTML message body");
+  }
+
+  /**
    * Test links pattern replacements in plaintext messages
    */
   function test_plaintext()
@@ -145,4 +156,16 @@
     $this->assertNoPattern('|<p>test2</p>|', $washed, "Conditional HTML comments");
   }
 
+  /**
+   * Test URI base resolving in HTML messages
+   */
+  function test_resolve_base()
+  {
+    $html = file_get_contents(TESTS_DIR . 'src/htmlbase.txt');
+    $html = rcmail_resolve_base($html);
+
+    $this->assertPattern('|src="http://alec\.pl/dir/img1\.gif"|', $html, "URI base resolving [1]");
+    $this->assertPattern('|src="http://alec\.pl/dir/img2\.gif"|', $html, "URI base resolving [2]");
+    $this->assertPattern('|src="http://alec\.pl/img3\.gif"|', $html, "URI base resolving [3]");
+  }
 }

--
Gitblit v1.9.1