From e43cf169b73fde3589fd47bfed2aa717f8e8f8de Mon Sep 17 00:00:00 2001 From: Matthew Flaschen Date: Tue, 12 Feb 2013 16:06:58 -0500 Subject: [PATCH] QUnit testrunner: Fix extend call * deep only has an effect as the first argument. http://api.jquery.com/jQuery.extend/#jQuery-extend-deep-target-object1-objectN Change-Id: I7d20f0b2f4ea63b7e8ce102d786df8d6ae008725 --- tests/qunit/data/testrunner.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/qunit/data/testrunner.js b/tests/qunit/data/testrunner.js index 0c3d364a18..b751ca929f 100644 --- a/tests/qunit/data/testrunner.js +++ b/tests/qunit/data/testrunner.js @@ -114,11 +114,11 @@ // 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 ); + return $.extend( /*deep=*/true, {}, liveConfig, custom ); } function freshMessagesCopy( custom ) { - return $.extend( {}, liveMessages, custom, /*deep=*/true ); + return $.extend( /*deep=*/true, {}, liveMessages, custom ); } log = QUnit.urlParams.mwlogenv ? mw.log : function () {}; -- 2.20.1