From: Krinkle <krinkle@users.mediawiki.org>
Date: Sun, 29 May 2011 04:11:10 +0000 (+0000)
Subject: Fix issues raised through TestSwarm
X-Git-Tag: 1.31.0-rc.0~29874
X-Git-Url: http://git.cyclocoop.org//%27%40script%40/%27?a=commitdiff_plain;h=c14869313d6cda2029681f64e18232e0a0b28c74;p=lhc%2Fweb%2Fwiklou.git

Fix issues raised through TestSwarm
* Instead of delete window.foobar whitelist the global in QUnit.config.pollution
** the reason either is needed is to make QUnit's "noglobal" option useful)
** delete window.foo throws an "TypeError: Object doesn't support this action" in Internet Explorer.
-> http://perfectionkills.com/understanding-delete/
* Remove other globals introduced
---

diff --git a/resources/mediawiki/mediawiki.js b/resources/mediawiki/mediawiki.js
index 2a65c6c6e7..05fde3fe07 100644
--- a/resources/mediawiki/mediawiki.js
+++ b/resources/mediawiki/mediawiki.js
@@ -246,11 +246,12 @@ window.mediaWiki = new ( function( $ ) {
 	 * Gets a message object, similar to wfMessage()
 	 *
 	 * @param key string Key of message to get
-	 * @param parameters mixed First argument in a list of variadic arguments,
+	 * @param parameter_1 mixed First argument in a list of variadic arguments,
 	 * each a parameter for $N replacement in messages.
 	 * @return Message
 	 */
 	this.message = function( key, parameter_1 /* [, parameter_2] */ ) {
+		var parameters;
 		// Support variadic arguments
 		if ( parameter_1 !== undefined ) {
 			parameters = $.makeArray( arguments );
diff --git a/tests/qunit/suites/resources/mediawiki.util/mediawiki.util.js b/tests/qunit/suites/resources/mediawiki.util/mediawiki.util.js
index 68ce17c161..0b32b49003 100644
--- a/tests/qunit/suites/resources/mediawiki.util/mediawiki.util.js
+++ b/tests/qunit/suites/resources/mediawiki.util/mediawiki.util.js
@@ -50,7 +50,7 @@ test( 'wikiScript', function(){
 test( 'addCSS', function(){
 	expect(3);
 
-	window.a = mw.util.addCSS( '#bodyContent { visibility: hidden; }' );
+	var a = mw.util.addCSS( '#bodyContent { visibility: hidden; }' );
 	ok(  a, 'function works' );
 	deepEqual( a.disabled, false, 'property "disabled" is available and set to false' );
 
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.js b/tests/qunit/suites/resources/mediawiki/mediawiki.js
index 150dd782eb..c2a6af5c37 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.js
@@ -64,8 +64,8 @@ test( 'mw.Map', function(){
 	deepEqual( 'anotherGlobalMapChecker' in window, true, 'new mw.Map( true ) did store its values in the global window object' );
 	ok( window.anotherGlobalMapChecker, 'new mw.Map( true ) did store its values in the global window object' );
 
-	// Clean up
-	delete window.anotherGlobalMapChecker;
+	// Whitelist this global variable for QUnit 'noglobal' mode
+	QUnit.config.pollution.push( 'anotherGlobalMapChecker' );
 });
 
 test( 'mw.config', function(){
@@ -111,6 +111,7 @@ test( 'mw.messages / mw.message / mw.msg', function(){
 	deepEqual( goodbye.exists(), false, 'Message.exists() returns false for inexisting messages' );
 
 	equal( goodbye.toString(), '<goodbye>', 'Message.toString() returns <key> if key does not exist' );
+
 });
 
 test( 'mw.msg', function(){