Updating mw.util.test.js + fixing minor bugs that were discovered through it

Updating mw.util.test.js
* Adding tests for modules now loaded by default [[RL/DM]]. Still not all of them, but it's getting there
* Changing order to either alphabetical order or order from source code (instead of random or chronological)
* adding addHead() function
* Fixing a bug caused by addHead() with  (which selected all rows instead of rows that contain actual tests) - also removed the need for the "+1" adjustment later on in the code (which was needed since  contained the first row with the column headings)
Fixed bugs that were found through testing:
* No title attribute was set for skins without portlets. (it was after the portlet-presence check).
  Now older skins get the title attribute as well.
* Modern's article-container ('#mw_contentholder') is added to the definition for mw.util. in mw.util.init()

diff --git a/resources/mediawiki.util/mediawiki.util.js b/resources/mediawiki.util/mediawiki.util.js
index 472730a..65936af 100644 (file)
--- a/resources/mediawiki.util/mediawiki.util.js
+++ b/resources/mediawiki.util/mediawiki.util.js
@@ -59,10 +59,22 @@
 
                                        /* Fill $content var */
                                        if ( $( '#bodyContent' ).length ) {
+                                               // Vector, Monobook, Chick etc.
                                                mw.util.$content = $( '#bodyContent' );
+
+                                       } else if ( $( '#mw_contentholder' ).length ) {
+                                               // Modern
+                                               mw.util.$content = $( '#mw_contentholder' );
+
                                        } else if ( $( '#article' ).length ) {
+                                               // Standard, CologneBlue
                                                mw.util.$content = $( '#article' );
+
                                        } else {
+                                               // #content is present on almost all if not all skins. Most skins (the above cases)
+                                               // have #content too, but as a outer wrapper instead of the article text container.
+                                               // The skins that don't have an outer wrapper have #content for everything
+                                               // so it's a good fallback
                                                mw.util.$content = $( '#content' );
                                        }
 
@@ -299,6 +311,9 @@
                        }
                        // Setup the anchor tag
                        var $link = $( '<a />' ).attr( 'href', href ).text( text );
+                       if ( tooltip ) {
+                               $link.attr( 'title', tooltip );
+                       }
 
                        // Some skins don't have any portlets
                        // just add it to the bottom of their 'sidebar' element as a fallback
@@ -352,8 +367,6 @@
                                if ( accesskey ) {
                                        $link.attr( 'accesskey', accesskey );
                                        tooltip += ' [' + accesskey + ']';
-                               }
-                               if ( tooltip ) {
                                        $link.attr( 'title', tooltip );
                                }
                                if ( accesskey && tooltip ) {

diff --git a/resources/mediawiki.util/mediawiki.util.test.js b/resources/mediawiki.util/mediawiki.util.test.js
index 5da879e..be7646c 100644 (file)
--- a/resources/mediawiki.util/mediawiki.util.test.js
+++ b/resources/mediawiki.util/mediawiki.util.test.js
@@ -29,9 +29,23 @@
                                contain = result;
                        }
                        this.addedTests.push( [code, result, contain] );
-                       this.$table.append( '<tr><td>' + mw.html.escape( code ).replace(/  /g, '&nbsp;&nbsp;' )
-                               + '</td><td>' + mw.html.escape( result ).replace(/  /g, '&nbsp;&nbsp;' )
+                       this.$table.append( '<tr><td>' + mw.html.escape( code ).replace( /  /g, '&nbsp;&nbsp;' )
+                               + '</td><td>' + mw.html.escape( result ).replace( /  /g, '&nbsp;&nbsp;' )
                                + '</td><td></td><td>?</td></tr>' );
+                       return true;
+               },
+
+               /**
+               * Adds a heading to the test-table
+               *
+               * @param title String   Title of the section
+               */
+               'addHead' : function( title ) {
+                       if ( !title ) {
+                               return false;
+                       }
+                       this.$table.append( '<tr><th colspan="4">' + mw.html.escape( title ).replace( /  /g, '&nbsp;&nbsp;' ) + '</th></tr>' );
+                       return true;
                },
 
                /* Initialisation */
@@ -56,75 +70,203 @@
                                                );
                                                mw.test.$table = $( 'table#mw-mwutiltest-table' );
 
-                                               // Populate tests
+                                               /* Populate tests */
+
+                                               // Main modules and their aliases
+                                               mw.test.addHead( 'Main modules and their aliases' );
+
+                                               mw.test.addTest( 'typeof mediaWiki',
+                                                       'object (string)' );
+
+                                               mw.test.addTest( 'typeof mw',
+                                                       'object (string)' );
+
+                                               mw.test.addTest( 'typeof jQuery',
+                                                       'function (string)' );
+
+                                               mw.test.addTest( 'typeof $',
+                                                       'function (string)' );
+
+                                               // Prototype functions added by MediaWiki
+                                               mw.test.addHead( 'Prototype functions added by MediaWiki' );
+
                                                mw.test.addTest( 'typeof $.trimLeft',
                                                        'function (string)' );
-                                               mw.test.addTest( '$.trimLeft(\'  foo bar  \')',
+
+                                               mw.test.addTest( '$.trimLeft( "  foo bar  " )',
                                                        'foo bar   (string)' );
+
                                                mw.test.addTest( 'typeof $.trimRight',
                                                        'function (string)' );
-                                               mw.test.addTest( '$.trimRight(\'  foo bar  \')',
+
+                                               mw.test.addTest( '$.trimRight( "  foo bar  " )',
                                                        '  foo bar (string)' );
+
+                                               mw.test.addTest( 'typeof $.ucFirst',
+                                                       'function (string)' );
+
+                                               mw.test.addTest( '$.ucFirst( "mediawiki" )',
+                                                       'Mediawiki (string)' );
+
+                                               mw.test.addTest( 'typeof $.escapeRE',
+                                                       'function (string)' );
+
+                                               mw.test.addTest( '$.escapeRE( ".st{e}$st" )',
+                                                       '\\.st\\{e\\}\\$st (string)' );
+
                                                mw.test.addTest( 'typeof $.isEmpty',
                                                        'function (string)' );
-                                               mw.test.addTest( '$.isEmpty(\'string\')',
+
+                                               mw.test.addTest( '$.isEmpty( "string" )',
                                                        'false (boolean)' );
-                                               mw.test.addTest( '$.isEmpty(\'0\')',
+
+                                               mw.test.addTest( '$.isEmpty( "0" )',
                                                        'true (boolean)' );
+
                                                mw.test.addTest( '$.isEmpty([])',
                                                        'true (boolean)' );
+
                                                mw.test.addTest( 'typeof $.compareArray',
                                                        'function (string)' );
-                                               mw.test.addTest( '$.compareArray( [1, "a", [], [2, \'b\'] ], [1, \'a\', [], [2, "b"] ] )',
+
+                                               mw.test.addTest( '$.compareArray( [1, "a", [], [2, "b"] ], [1, "a", [], [2, "b"] ] )',
                                                        'true (boolean)' );
+
                                                mw.test.addTest( '$.compareArray( [1], [2] )',
                                                        'false (boolean)' );
-                                               mw.test.addTest( '4',
-                                                       '4 (number)' );
-                                               mw.test.addTest( 'typeof mediaWiki',
+
+                                               mw.test.addTest( 'typeof $.compareObject',
+                                                       'function (string)' );
+
+                                               // mediawiki.js
+                                               mw.test.addHead( 'mediawiki.js' );
+
+                                               mw.test.addTest( 'mw.config instanceof mw.Map',
+                                                       'true (boolean)' );
+
+                                               mw.test.addTest( 'mw.config.exists()',
+                                                       'true (boolean)' );
+
+                                               mw.test.addTest( 'mw.config.exists( "wgSomeName" )',
+                                                       'false (boolean)' );
+
+                                               mw.test.addTest( 'mw.config.exists( ["wgCanonicalNamespace", "wgTitle"] )',
+                                                       'true (boolean)' );
+
+                                               mw.test.addTest( 'mw.config.exists( ["wgSomeName", "wgTitle"] )',
+                                                       'false (boolean)' );
+
+                                               mw.test.addTest( 'mw.config.get( "wgTitle" )',
+                                                       'BlankPage (string)' );
+
+                                               mw.test.addTest( 'var a = mw.config.get( ["wgTitle"] ); a.wgTitle',
+                                                       'BlankPage (string)' );
+
+                                               mw.test.addTest( 'typeof mw.html',
                                                        'object (string)' );
-                                               mw.test.addTest( 'typeof mw',
+
+                                               mw.test.addTest( 'mw.html.escape( \'<mw awesome="awesome">\' )',
+                                                       '&lt;mw awesome=&quot;awesome&quot;&gt; (string)' );
+
+                                               mw.test.addTest( 'mw.html.element( "hr" )',
+                                                       '<hr/> (string)' );
+
+                                               mw.test.addTest( 'mw.html.element( "img", { "src": "http://mw.org/?title=Main page&action=edit" } )',
+                                                       '<img src="http://mw.org/?title=Main page&amp;action=edit"/> (string)' );
+
+                                               mw.test.addTest( 'typeof mw.loader',
                                                        'object (string)' );
-                                               mw.test.addTest( 'typeof mw.util',
+
+                                               mw.test.addTest( 'typeof mw.loader.using',
+                                                       'function (string)' );
+
+                                               mw.test.addTest( 'typeof mw.Map',
+                                                       'function (string)' );
+
+                                               mw.test.addTest( 'typeof mw.user',
                                                        'object (string)' );
-                                               mw.test.addTest( 'typeof mw.html',
+
+                                               mw.test.addTest( 'typeof mw.user.anonymous()',
+                                                       'boolean (string)' );
+
+                                               // mediawiki.util.js
+                                               mw.test.addHead( 'mediawiki.util.js' );
+
+                                               mw.test.addTest( 'typeof mw.util',
                                                        'object (string)' );
-                                               mw.test.addTest( 'typeof $.ucFirst',
-                                                       'function (string)' );
-                                               mw.test.addTest( '$.ucFirst( \'mediawiki\' )',
-                                                       'Mediawiki (string)' );
-                                               mw.test.addTest( 'typeof $.escapeRE',
+
+                                               mw.test.addTest( 'typeof mw.util.rawurlencode',
                                                        'function (string)' );
-                                               mw.test.addTest( '$.escapeRE( \'.st{e}$st\' )',
-                                                       '\\.st\\{e\\}\\$st (string)' );
-                                               mw.test.addTest( 'typeof $.fn.checkboxShiftClick',
+
+                                               mw.test.addTest( 'mw.util.rawurlencode( "Test:A & B/Here" )',
+                                                       'Test%3AA%20%26%20B%2FHere (string)' );
+
+                                               mw.test.addTest( 'typeof mw.util.wikiUrlencode',
                                                        'function (string)' );
-                                               mw.test.addTest( 'typeof mw.util.rawurlencode',
+
+                                               mw.test.addTest( 'mw.util.wikiUrlencode( "Test:A & B/Here" )',
+                                                       'Test:A_%26_B/Here (string)' );
+
+                                               mw.test.addTest( 'typeof mw.util.addCSS',
                                                        'function (string)' );
-                                               mw.test.addTest( 'mw.util.rawurlencode( \'Test: A&B/Here\' )',
-                                                       'Test%3A%20A%26B%2FHere (string)' );
+
+                                               mw.test.addTest( 'var a = mw.util.addCSS( ".plainlinks { color:green; }" ); a.disabled;',
+                                                       'false (boolean)',
+                                                       '(boolean)' );
+
                                                mw.test.addTest( 'typeof mw.util.wikiGetlink',
                                                        'function (string)' );
+
                                                mw.test.addTest( 'typeof mw.util.getParamValue',
                                                        'function (string)' );
-                                               mw.test.addTest( 'mw.util.getParamValue( \'action\' )',
+
+                                               mw.test.addTest( 'mw.util.getParamValue( "action" )',
                                                        'mwutiltest (string)' );
-                                               mw.test.addTest( 'mw.util.getParamValue( \'foo\', \'http://mw.org/?foo=wrong&foo=right#&foo=bad\' )',
+
+                                               mw.test.addTest( 'mw.util.getParamValue( "foo", "http://mw.org/?foo=wrong&foo=right#&foo=bad" )',
                                                        'right (string)' );
+
                                                mw.test.addTest( 'mw.util.tooltipAccessKeyRegexp.constructor.name',
                                                        'RegExp (string)' );
+
                                                mw.test.addTest( 'typeof mw.util.updateTooltipAccessKeys',
                                                        'function (string)' );
+
+                                               mw.test.addTest( 'mw.util.$content instanceof jQuery',
+                                                       'true (boolean)' );
+
+                                               mw.test.addTest( 'mw.util.$content.size()',
+                                                       '1 (number)' );
+
                                                mw.test.addTest( 'typeof mw.util.addPortletLink',
                                                        'function (string)' );
-                                               mw.test.addTest( 'typeof mw.util.addPortletLink( "p-tb", "http://mediawiki.org/", "MediaWiki.org", "t-mworg", "Go to MediaWiki.org ", "m", "#t-print" )',
+
+                                               mw.test.addTest( 'typeof mw.util.addPortletLink( "p-tb", "http://mediawiki.org/wiki/ResourceLoader", "ResourceLoader", "t-rl", "More info about ResourceLoader on MediaWiki.org ", "l", "#t-specialpages" )',
                                                        'object (string)' );
-                                               mw.test.addTest( 'a = mw.util.addPortletLink( "p-tb", "http://mediawiki.org/", "MediaWiki.org", "t-mworg", "Go to MediaWiki.org ", "m", "#t-print" ); $(a).text();',
+
+                                               mw.test.addTest( 'var a = mw.util.addPortletLink( "p-tb", "http://mediawiki.org/", "MediaWiki.org", "t-mworg", "Go to MediaWiki.org ", "m", "#t-rl" ); $(a).text();',
                                                        'MediaWiki.org (string)' );
-                                               mw.test.addTest( 'mw.html.element( \'hr\' )',
-                                                       '<hr/> (string)' );
-                                               mw.test.addTest( 'mw.html.element( \'img\', { \'src\': \'http://mw.org/?title=Main page&action=edit\' } )',
-                                                       '<img src="http://mw.org/?title=Main page&amp;action=edit"/> (string)' );
+
+                                               mw.test.addTest( 'typeof mw.util.jsMessage',
+                                                       'function (string)' );
+
+                                               mw.test.addTest( 'mw.util.jsMessage( mw.config.get( "wgSiteName" ) + " is <b>Awesome</b>." )',
+                                                       'true (boolean)' );
+
+                                               // jQuery plugins
+                                               mw.test.addHead( 'jQuery plugins' );
+
+                                               mw.test.addTest( 'typeof $.client',
+                                                       'object (string)' );
+
+                                               mw.test.addTest( 'typeof $.client.profile',
+                                                       'function (string)' );
+
+                                               mw.test.addTest( 'var a = $.client.profile(); typeof a.name',
+                                                       'string (string)' );
+
+                                               mw.test.addTest( 'typeof $.fn.makeCollapsible',
+                                                       'function (string)' );
 
                                                // Run tests and compare results
                                                var     exec,
@@ -134,7 +276,7 @@
                                                        numberofpasseds = 0,
                                                        numberofpartials = 0,
                                                        numberoferrors = 0,
-                                                       $testrows = mw.test.$table.find( 'tr' );
+                                                       $testrows = mw.test.$table.find( 'tr:has(td)' );
 
                                                $.each( mw.test.addedTests, function( i ) {
                                                        numberoftests++;
@@ -144,11 +286,11 @@
                                                        shouldcontain = mw.test.addedTests[i][2];
                                                        doesreturn = eval( exec );
                                                        doesreturn = doesreturn + ' (' + typeof doesreturn + ')';
-                                                       $thisrow = $testrows.eq( i + 1 );
+                                                       $thisrow = $testrows.eq( i );
                                                        $thisrow.find( '> td' ).eq(2).html( mw.html.escape( doesreturn ).replace(/  /g, '&nbsp;&nbsp;' ) );
 
                                                        if ( doesreturn.indexOf( shouldcontain ) !== -1 ) {
-                                                               if (doesreturn == shouldreturn){
+                                                               if ( doesreturn == shouldreturn ) {
                                                                        $thisrow.find( '> td' ).eq(3).css( 'background', '#EFE' ).text( 'OK' );
                                                                        numberofpasseds++;
                                                                } else {