Changeset 1651

Timestamp:

03/01/10 11:17:49 (5 months ago)

Author:

klemens

Message:

ullWidget does not escape anymore

Location:

trunk/test/unit/ullTableTool

Files:

• ullWidgetLinkTest.php (modified) (2 diffs)
• ullWidgetTest.php (modified) (1 diff)

trunk/test/unit/ullTableTool/ullWidgetLinkTest.php

@@ -6 +6 @@
 //sfLoader::loadHelpers('I18N');
 
-$t = new lime_test(4, new lime_output_color(), $configuration);
+$t = new lime_test(2, new lime_output_color(), $configuration);
 sfContext::createInstance($configuration);
 
@@ -16 +16 @@
 $t->diag('->render()');  
   $t->is($w->render('foo', 'bar', array('href' => '/ullWiki/show/id/4')), '<b><a href="/ullWiki/show/id/4">bar</a></b>', 'renders the widget as HTML');
-  $t->is($w->render('foo', 'SchÌßel', array('href' => '/ullWiki/show/id/4')), '<b><a href="/ullWiki/show/id/4">Sch&uuml;&szlig;el</a></b>', 'correctly escapes umlauts');
-  $t->is($w->render('foo', 'Welcome to <i>Italy</i>', array('href' => '/ullWiki/show/id/4')), '<b><a href="/ullWiki/show/id/4">Welcome to &lt;i&gt;Italy&lt;/i&gt;</a></b>', 'escapes html entities');

trunk/test/unit/ullTableTool/ullWidgetTest.php

@@ -16 +16 @@
 $t->diag('->render()');  
   $t->is($w->render('foo', 'bar'), 'bar', 'renders the widget as HTML');
-  $t->is($w->render('foo', 'SchÌßel'), 'Schüßel', 'correctly escapes umlauts');
-  $t->is($w->render('foo', 'Welcome to <i>Italy</i>'), 'Welcome to &lt;i&gt;Italy&lt;/i&gt;', 'escapes html entities');
+  // Do NOT encode html entities
+//  $t->is($w->render('foo', 'SchÌßel'), 'Sch&uuml;&szlig;el', 'correctly escapes umlauts');
+//  $t->is($w->render('foo', 'Welcome to <i>Italy</i>'), 'Welcome to &lt;i&gt;Italy&lt;/i&gt;', 'escapes html entities');
+  $t->is($w->render('foo', 'SchÌßel'), 'SchÌßel', 'Does not html entity decode umlauts');
+  $t->is($w->render('foo', 'Welcome to <i>Italy</i>'), 'Welcome to <i>Italy</i>', 'Does not html entity tags (e.g. "<" chars)');  
 
 $t->diag('nowrap option');