diff options
author | ArthurHoaro <arthur@hoa.ro> | 2016-10-12 13:58:35 +0200 |
---|---|---|
committer | ArthurHoaro <arthur@hoa.ro> | 2016-10-12 13:58:35 +0200 |
commit | bc22c9a0acb095970e9494cbe8954f0612e05dc0 (patch) | |
tree | 4e3a94b7469f5b2e3eaf946756235730429bf9d4 /tests/Url | |
parent | 890afc32f744859d11b97eb26ed5c030af9b4145 (diff) | |
parent | ebd67c6e1b40aebdd3a52285ce9ff9412b2a3038 (diff) | |
download | Shaarli-bc22c9a0acb095970e9494cbe8954f0612e05dc0.tar.gz Shaarli-bc22c9a0acb095970e9494cbe8954f0612e05dc0.tar.zst Shaarli-bc22c9a0acb095970e9494cbe8954f0612e05dc0.zip |
Merge tag 'v0.7.0' of github.com:shaarli/Shaarli into stable
Release v0.7.0
Diffstat (limited to 'tests/Url')
-rw-r--r-- | tests/Url/UrlTest.php | 22 |
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 | |||
128 | self::$baseUrl.'?my=stuff&is=kept#again', | 128 | self::$baseUrl.'?my=stuff&is=kept#again', |
129 | $url->cleanup() | 129 | $url->cleanup() |
130 | ); | 130 | ); |
131 | |||
132 | // test firefox reader url | ||
133 | $url = new Url( | ||
134 | 'about://reader?url=' . urlencode(self::$baseUrl .'?my=stuff&is=kept') | ||
135 | ); | ||
136 | $this->assertEquals(self::$baseUrl.'?my=stuff&is=kept', $url->cleanup()); | ||
137 | |||
131 | } | 138 | } |
132 | 139 | ||
133 | /** | 140 | /** |
@@ -174,4 +181,19 @@ class UrlTest extends PHPUnit_Framework_TestCase | |||
174 | $url = new Url('ftp://save.tld/mysave'); | 181 | $url = new Url('ftp://save.tld/mysave'); |
175 | $this->assertFalse($url->isHttp()); | 182 | $this->assertFalse($url->isHttp()); |
176 | } | 183 | } |
184 | |||
185 | /** | ||
186 | * Test IndToAscii. | ||
187 | */ | ||
188 | function testIndToAscii() | ||
189 | { | ||
190 | $ind = 'http://www.académie-française.fr/'; | ||
191 | $expected = 'http://www.xn--acadmie-franaise-npb1a.fr/'; | ||
192 | $url = new Url($ind); | ||
193 | $this->assertEquals($expected, $url->idnToAscii()); | ||
194 | |||
195 | $notInd = 'http://www.academie-francaise.fr/'; | ||
196 | $url = new Url($notInd); | ||
197 | $this->assertEquals($notInd, $url->idnToAscii()); | ||
198 | } | ||
177 | } | 199 | } |