resources: Strip '$' and 'mw' from file closures

[lhc/web/wiklou.git] / tests / qunit / suites / resources / mediawiki / mediawiki.jqueryMsg.test.js

diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.jqueryMsg.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.jqueryMsg.test.js
index 7701170..2491ca3 100644 (file)
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.jqueryMsg.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.jqueryMsg.test.js
@@ -1,4 +1,4 @@
-( function ( mw, $ ) {
+( function () {
        /* eslint-disable camelcase */
        var formatText, formatParse, formatnumTests, specialCharactersPageName, expectedListUsers,
                expectedListUsersSitename, expectedLinkPagenamee, expectedEntrypoints,
@@ -105,10 +105,7 @@
                                        skin: mw.config.get( 'skin' ),
                                        lang: langCode,
                                        debug: mw.config.get( 'debug' ),
-                                       modules: [
-                                               'mediawiki.language.data',
-                                               'mediawiki.language'
-                                       ].join( '|' ),
+                                       modules: 'mediawiki.language',
                                        only: 'scripts'
                                },
                                dataType: 'script',
@@ -367,7 +364,7 @@
        QUnit.test( 'Match PHP parser', function ( assert ) {
                var tasks;
                mw.messages.set( mw.libs.phpParserData.messages );
-               tasks = $.map( mw.libs.phpParserData.tests, function ( test ) {
+               tasks = mw.libs.phpParserData.tests.map( function ( test ) {
                        var done = assert.async();
                        return function ( next, abort ) {
                                getMwLanguage( test.lang )
@@ -903,6 +900,10 @@
                                getMwLanguage( test.lang )
                                        .then( function ( langClass ) {
                                                var parser;
+                                               // The unit tests perform hot-reloading of mw.language (in hacky way).
+                                               // For the languages/*.js script files to work, they need to statically
+                                               // access mw.language.getData() for the "current" language.
+                                               mw.language = langClass;
                                                mw.config.set( 'wgUserLanguage', test.lang );
                                                parser = new mw.jqueryMsg.Parser( { language: langClass } );
                                                assert.strictEqual(
@@ -1220,4 +1221,4 @@
                        'setParserDefaults is deep if requested'
                );
        } );
-}( mediaWiki, jQuery ) );
+}() );