From e67a1216899093e81c7457cc902274248b2fc7fd Mon Sep 17 00:00:00 2001
From: Krinkle <krinkle@users.mediawiki.org>
Date: Fri, 24 Feb 2012 01:00:54 +0000
Subject: [PATCH] [JSTesting] mock/restore mw.messages as well, like mw.config

---
 tests/qunit/data/testrunner.js | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/tests/qunit/data/testrunner.js b/tests/qunit/data/testrunner.js
index 87795cf46b..c1cce83116 100644
--- a/tests/qunit/data/testrunner.js
+++ b/tests/qunit/data/testrunner.js
@@ -105,37 +105,45 @@ QUnit.config.urlConfig.push( 'mwlogenv' );
  * </code>
  */
 QUnit.newMwEnvironment = ( function () {
-	var liveConfig, freshConfigCopy, log;
+	var log, liveConfig, liveMsgs;
 
 	liveConfig = mw.config.values;
+	liveMsgs = mw.messages.values;
 
-	freshConfigCopy = function ( custom ) {
+	function freshConfigCopy( custom ) {
 		// "deep=true" is important here.
 		// Otherwise we just create a new object with values referring to live config.
 		// e.g. mw.config.set( 'wgFileExtensions', [] ) would not effect liveConfig,
 		// but mw.config.get( 'wgFileExtensions' ).push( 'png' ) would as the array
 		// was passed by reference in $.extend's loop.
 		return $.extend({}, liveConfig, custom, /*deep=*/true );
-	};
+	}
+
+	function freshMsgsCopy( custom ) {
+		return $.extend({}, liveMsgs, custom, /*deep=*/true );
+	}
 
 	log = QUnit.urlParams.mwlogenv ? mw.log : function () {};
 
-	return function ( override ) {
-		override = override || {};
+	return function ( overrideConfig, overrideMsgs ) {
+		overrideConfig = overrideConfig || {};
+		overrideMsgs = overrideMsgs || {};
 
 		return {
 			setup: function () {
 				log( 'MwEnvironment> SETUP    for "' + QUnit.config.current.module
 					+ ': ' + QUnit.config.current.testName + '"' );
-				// Greetings, mock configuration!
-				mw.config.values = freshConfigCopy( override );
+				// Greetings, mock environment!
+				mw.config.values = freshConfigCopy( overrideConfig );
+				mw.messages.values = freshMsgsCopy( overrideMsgs );
 			},
 
 			teardown: function () {
 				log( 'MwEnvironment> TEARDOWN for "' + QUnit.config.current.module
 					+ ': ' + QUnit.config.current.testName + '"' );
-				// Farewell, mock configuration!
+				// Farewell, mock environment!
 				mw.config.values = liveConfig;
+				mw.messages.values = liveMsgs;
 			}
 		};
 	};
-- 
2.20.1