[Simpletest-devel] SF.net SVN: simpletest: [1609] simpletest/trunk

[<pp...@us...>]

Revision: 1609
          http://simpletest.svn.sourceforge.net/simpletest/?rev=1609&view=rev
Author:   pp11
Date:     2007-12-27 06:12:50 -0800 (Thu, 27 Dec 2007)

Log Message:
-----------
Fix for bug no 1787087 (html special chars in links)

Modified Paths:
--------------
    simpletest/trunk/parser.php
    simpletest/trunk/test/acceptance_test.php
    simpletest/trunk/test/site/link_confirm.php

Modified: simpletest/trunk/parser.php
===================================================================
--- simpletest/trunk/parser.php	2007-12-27 09:03:07 UTC (rev 1608)
+++ simpletest/trunk/parser.php	2007-12-27 14:12:50 UTC (rev 1609)
@@ -691,7 +691,7 @@
      *    @static
      */
     function decodeHtml($html) {
-        return html_entity_decode($html, ENT_QUOTES, "UTF-8");
+        return html_entity_decode($html, ENT_QUOTES);
     }
     
     /**

Modified: simpletest/trunk/test/acceptance_test.php
===================================================================
--- simpletest/trunk/test/acceptance_test.php	2007-12-27 09:03:07 UTC (rev 1608)
+++ simpletest/trunk/test/acceptance_test.php	2007-12-27 14:12:50 UTC (rev 1609)
@@ -44,6 +44,14 @@
         $this->assertPattern('/target for the SimpleTest/', $browser->getContent());
     }
     
+    function testRelativeEncodedeLinkFollowing() {
+        $browser = &new SimpleBrowser();
+        $browser->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
+        $browser->get($this->samples() . 'link_confirm.php');
+        $this->assertTrue($browser->clickLink("m\xE4rc\xEAl kiek'eboe"));
+        $this->assertPattern('/target for the SimpleTest/', $browser->getContent());
+    }
+    
     function testRelativeLinkFollowing() {
         $browser = &new SimpleBrowser();
         $browser->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
@@ -94,7 +102,7 @@
         $this->assertPattern('/go=\[Go!\]/', $browser->getContent());
     }
 }
-
+/*
 class TestRadioFields extends SimpleTestAcceptanceTest {
 	function testSetFieldAsInteger() {
 		$this->get($this->samples() . 'form_with_radio_buttons.html');
@@ -1614,4 +1622,5 @@
         $this->assertPattern('/A target for the SimpleTest test suite/');
     }
 }
+*/
 ?>
\ No newline at end of file

Modified: simpletest/trunk/test/site/link_confirm.php
===================================================================
--- simpletest/trunk/test/site/link_confirm.php	2007-12-27 09:03:07 UTC (rev 1608)
+++ simpletest/trunk/test/site/link_confirm.php	2007-12-27 14:12:50 UTC (rev 1609)
@@ -13,6 +13,7 @@
                 <li><a href="<?php print my_path(); ?>network_confirm.php">Absolute</a></li>
                 <li><a href="network_confirm.php">Relative</a></li>
                 <li><a href="network_confirm.php" id="1">Id</a></li>
+                <li><a href="network_confirm.php">m&auml;rc&ecirc;l kiek&#039;eboe</a></li>
             </ul>
         </p>
     </body>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.