From 8a617673b9b26251e974d09880408513f44728f9 Mon Sep 17 00:00:00 2001
From: Santhosh Thottingal <santhosh.thottingal@gmail.com>
Date: Wed, 10 Oct 2012 14:47:24 +0530
Subject: [PATCH] Fix the jqueryMsg tests for plural rule parsing

mediawiki.language.data was not retrieved from server corresponding to language
changes

mediawiki.language.convertPlural depends on currentUI language from
mw.config.get( 'wgUserLanguage' ). Set that for each parser test and
restore it at teardown of QUnit.

Change-Id: I5b81cd8573311d1c0d8817e430108f4ad76de6bd
---
 .../suites/resources/mediawiki/mediawiki.jqueryMsg.test.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.jqueryMsg.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.jqueryMsg.test.js
index c80296f5a1..bce7bd7106 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.jqueryMsg.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.jqueryMsg.test.js
@@ -6,7 +6,6 @@ QUnit.module( 'mediawiki.jqueryMsg', QUnit.newMwEnvironment( {
 		mw.language = $.extend( true, {}, this.orgMwLangauge );
 	},
 	teardown: function () {
-		// Restore
 		mw.language = this.orgMwLangauge;
 	}
 }) );
@@ -25,7 +24,10 @@ function getMwLanguage( langCode, cb ) {
 			skin: mw.config.get( 'skin' ),
 			lang: langCode,
 			debug: mw.config.get( 'debug' ),
-			modules: 'mediawiki.language',
+			modules: [
+				'mediawiki.language.data',
+				'mediawiki.language'
+			].join( '|' ),
 			only: 'scripts'
 		},
 		dataType: 'script'
@@ -141,6 +143,7 @@ QUnit.test( 'Output matches PHP parser', mw.libs.phpParserData.tests.length, fun
 				assert.ok( false, 'Language "' + test.lang + '" failed to load' );
 				return;
 			}
+			mw.config.set( 'wgUserLanguage', test.lang ) ;
 			var parser = new mw.jqueryMsg.parser( { language: langClass } );
 			assert.equal(
 				parser.parse( test.key, test.args ).html(),
-- 
2.20.1