Merge "Fixed dependencies for jquery.collapsibleTabs"

[lhc/web/wiklou.git] / tests / phpunit / includes / GlobalFunctions / wfUrlencodeTest.php

diff --git a/tests/phpunit/includes/GlobalFunctions/wfUrlencodeTest.php b/tests/phpunit/includes/GlobalFunctions/wfUrlencodeTest.php
index 582fd35..673702e 100644 (file)
--- a/tests/phpunit/includes/GlobalFunctions/wfUrlencodeTest.php
+++ b/tests/phpunit/includes/GlobalFunctions/wfUrlencodeTest.php
@@ -35,6 +35,7 @@ class wfUrlencodeTest extends MediaWikiTestCase {
                        : null
                ;
                $_SERVER['SERVER_SOFTWARE'] = $server;
+               wfUrlencode( null );
 
                // do the requested test
                $this->assertEquals(
@@ -49,6 +50,7 @@ class wfUrlencodeTest extends MediaWikiTestCase {
                } else {
                        $_SERVER['SERVER_SOFTWARE'] = $old;
                }
+               wfUrlencode( null );
        }
 
        /**
@@ -59,14 +61,6 @@ class wfUrlencodeTest extends MediaWikiTestCase {
                if( is_string( $expectations ) ) {
                        return $expectations;
                } elseif( is_array( $expectations ) ) {
-
-                       /**
-                        * FIXME FIXME FIXME FIXME
-                        * wfUrlencode use a static variable so we can not just
-                        * change the $GLOBALS server name :(
-                        */
-                       $this->markTestSkipped( 'FIXME: wfUrlencode() use a static, thus changing $GLOBALS[SERVER_SOFTWARE] is useless' );
-
                        if( !array_key_exists( $server, $expectations ) ) {
                                throw new MWException( __METHOD__ . " expectation does not have any value for server name $server. Check the provider array.\n" );
                        } else {
@@ -91,7 +85,7 @@ class wfUrlencodeTest extends MediaWikiTestCase {
         * If you want to add other HTTP server name, you will have to add a new
         * testing method much like the testEncodingUrlWith() method above. 
         */
-       public function provideURLS() {
+       public static function provideURLS() {
                return array(
                ### RFC 1738 chars      
                        // + is not safe
@@ -118,6 +112,9 @@ class wfUrlencodeTest extends MediaWikiTestCase {
                        // Other 'funnies' chars
                        array( '[]', '%5B%5D' ),
                        array( '<>', '%3C%3E' ),
+
+                       // Apostrophe is encoded
+                       array( '\'', '%27' ),
                );
        }
 }