Merge tag 'v0.7.0' of github.com:shaarli/Shaarli into stable

Release v0.7.0

1 files changed, 22 insertions, 0 deletions

diff --git a/tests/Url/UrlTest.php b/tests/Url/UrlTest.php
index 425327ed..ce82265e 100644
--- a/tests/Url/UrlTest.php
+++ b/tests/Url/UrlTest.php
@@ -128,6 +128,13 @@ class UrlTest extends PHPUnit_Framework_TestCase
             self::$baseUrl.'?my=stuff&is=kept#again',
             $url->cleanup()
         );
+
+        // test firefox reader url
+        $url = new Url(
+            'about://reader?url=' . urlencode(self::$baseUrl .'?my=stuff&is=kept')
+        );
+        $this->assertEquals(self::$baseUrl.'?my=stuff&is=kept', $url->cleanup());
+
     }
 
     /**
@@ -174,4 +181,19 @@ class UrlTest extends PHPUnit_Framework_TestCase
         $url = new Url('ftp://save.tld/mysave');
         $this->assertFalse($url->isHttp());
     }
+
+    /**
+     * Test IndToAscii.
+     */
+    function testIndToAscii()
+    {
+        $ind = 'http://www.académie-française.fr/';
+        $expected = 'http://www.xn--acadmie-franaise-npb1a.fr/';
+        $url = new Url($ind);
+        $this->assertEquals($expected, $url->idnToAscii());
+
+        $notInd = 'http://www.academie-francaise.fr/';
+        $url = new Url($notInd);
+        $this->assertEquals($notInd, $url->idnToAscii());
+    }
 }