From 4859fedb92b2ac0b3e717133c2ee32fa449ed06b Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Sat, 07 Aug 2010 08:04:39 -0400
Subject: [PATCH] Fix unit tests + update version

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

diff --git a/tests/mailfunc.php b/tests/mailfunc.php
index 5a17d31..a3008a6 100644
--- a/tests/mailfunc.php
+++ b/tests/mailfunc.php
@@ -15,7 +15,7 @@
     // simulate environment to successfully include func.inc
     $GLOBALS['RCMAIL'] = $RCMAIL = rcmail::get_instance();
     $GLOBALS['OUTPUT'] = $OUTPUT = $RCMAIL->load_gui();
-    $RCMAIL->action = 'spell';
+    $RCMAIL->action = 'autocomplete';
     $RCMAIL->imap_init(false);
     $IMAP = $RCMAIL->imap;
     
@@ -65,9 +65,9 @@
     
     $this->assertPattern('/<style [^>]+>/', $html2, "Allow styles in safe mode");
     $this->assertPattern('#src="http://evilsite.net/mailings/ex3.jpg"#', $html2, "Allow external images in HTML (safe mode)");
-    $this->assertPattern("#url\('http://evilsite.net/newsletter/image/bg/bg-64.jpg'\)#", $html2, "Allow external images in CSS (safe mode)");
+    $this->assertPattern("#url\('?http://evilsite.net/newsletter/image/bg/bg-64.jpg'?\)#", $html2, "Allow external images in CSS (safe mode)");
     
-    $css = '<link rel="stylesheet" type="text/css" href="./bin/modcss.php?u='.urlencode('http://anysite.net/styles/mail.css').'&amp;c=foo"';
+    $css = '<link rel="stylesheet" type="text/css" href="?_task=utils&amp;_action=modcss&amp;u='.urlencode('http://anysite.net/styles/mail.css').'&amp;c=foo"';
     $this->assertPattern('#'.preg_quote($css).'#', $html2, "Filter external styleseehts with bin/modcss.php");
   }
 

--
Gitblit v1.9.1