X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=tests%2Fqunit%2Fsuites%2Fresources%2Fmediawiki%2Fmediawiki.util.test.js;h=3679ed76f96d1fb77700cdabb0176b84d9f99b2e;hb=dfec83932fd38a9086eb5a2e212889ad00f35b0e;hp=ad6a0d0ab1cdfd9ca3596805b0a5b8a44cd6dec2;hpb=9ef78ab4c18ccb352043b87f371cc0a642f0166c;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.util.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.util.test.js
index ad6a0d0ab1..3679ed76f9 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.util.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.util.test.js
@@ -80,6 +80,7 @@
 		},
 		teardown: function () {
 			$.fn.updateTooltipAccessKeys.setTestMode( false );
+			mw.util.resetOptionsForTest();
 		},
 		messages: {
 			// Used by accessKeyLabel in test for addPortletLink
@@ -114,7 +115,7 @@
 			// Distant future: no legacy fallbacks
 			[ allNew, text, html5Encoded ]
 		].forEach( function ( testCase ) {
-			mw.config.set( 'wgFragmentMode', testCase[ 0 ] );
+			mw.util.setOptionsForTest( { FragmentMode: testCase[ 0 ] } );
 
 			assert.strictEqual( util.escapeIdForAttribute( testCase[ 1 ] ), testCase[ 2 ] );
 		} );
@@ -141,7 +142,7 @@
 			// Distant future: no legacy fallbacks
 			[ allNew, text, html5Encoded ]
 		].forEach( function ( testCase ) {
-			mw.config.set( 'wgFragmentMode', testCase[ 0 ] );
+			mw.util.setOptionsForTest( { FragmentMode: testCase[ 0 ] } );
 
 			assert.strictEqual( util.escapeIdForLink( testCase[ 1 ] ), testCase[ 2 ] );
 		} );
@@ -150,7 +151,7 @@
 	QUnit.test( 'wikiUrlencode', function ( assert ) {
 		assert.strictEqual( util.wikiUrlencode( 'Test:A & B/Here' ), 'Test:A_%26_B/Here' );
 		// See also wfUrlencodeTest.php#provideURLS
-		// eslint-disable-next-line jquery/no-each-util
+		// eslint-disable-next-line no-jquery/no-each-util
 		$.each( {
 			'+': '%2B',
 			'&': '%26',
@@ -210,32 +211,33 @@
 		href = util.getUrl( '#Fragment', { action: 'edit' } );
 		assert.strictEqual( href, '/w/index.php?action=edit#Fragment', 'empty title with query string and fragment' );
 
-		mw.config.set( 'wgFragmentMode', [ 'legacy' ] );
+		mw.util.setOptionsForTest( { FragmentMode: [ 'legacy' ] } );
 		href = util.getUrl( 'Foo:Sandbox \xC4#Fragment \xC4', { action: 'edit' } );
 		assert.strictEqual( href, '/w/index.php?title=Foo:Sandbox_%C3%84&action=edit#Fragment_.C3.84', 'title with query string, fragment, and special characters' );
 
-		mw.config.set( 'wgFragmentMode', [ 'html5' ] );
+		mw.util.setOptionsForTest( { FragmentMode: [ 'html5' ] } );
 		href = util.getUrl( 'Foo:Sandbox \xC4#Fragment \xC4', { action: 'edit' } );
 		assert.strictEqual( href, '/w/index.php?title=Foo:Sandbox_%C3%84&action=edit#Fragment_Ä', 'title with query string, fragment, and special characters' );
 
 		href = util.getUrl( 'Foo:%23#Fragment', { action: 'edit' } );
 		assert.strictEqual( href, '/w/index.php?title=Foo:%2523&action=edit#Fragment', 'title containing %23 (#), fragment, and a query string' );
 
-		mw.config.set( 'wgFragmentMode', [ 'legacy' ] );
+		mw.util.setOptionsForTest( { FragmentMode: [ 'legacy' ] } );
 		href = util.getUrl( '#+&=:;@$-_.!*/[]<>\'§', { action: 'edit' } );
 		assert.strictEqual( href, '/w/index.php?action=edit#.2B.26.3D:.3B.40.24-_..21.2A.2F.5B.5D.3C.3E.27.C2.A7', 'fragment with various characters' );
 
-		mw.config.set( 'wgFragmentMode', [ 'html5' ] );
+		mw.util.setOptionsForTest( { FragmentMode: [ 'html5' ] } );
 		href = util.getUrl( '#+&=:;@$-_.!*/[]<>\'§', { action: 'edit' } );
 		assert.strictEqual( href, '/w/index.php?action=edit#+&=:;@$-_.!*/[]<>\'§', 'fragment with various characters' );
 	} );
 
 	QUnit.test( 'wikiScript', function ( assert ) {
+		mw.util.setOptionsForTest( {
+			LoadScript: '/w/l.php'
+		} );
 		mw.config.set( {
 			// customized wgScript for T41103
 			wgScript: '/w/i.php',
-			// customized wgLoadScript for T41103
-			wgLoadScript: '/w/l.php',
 			wgScriptPath: '/w'
 		} );
 
@@ -245,8 +247,8 @@
 		assert.strictEqual( util.wikiScript( 'index' ), mw.config.get( 'wgScript' ),
 			'wikiScript( index ) returns wgScript'
 		);
-		assert.strictEqual( util.wikiScript( 'load' ), mw.config.get( 'wgLoadScript' ),
-			'wikiScript( load ) returns wgLoadScript'
+		assert.strictEqual( util.wikiScript( 'load' ), '/w/l.php',
+			'wikiScript( load ) returns /w/l.php'
 		);
 		assert.strictEqual( util.wikiScript( 'api' ), '/w/api.php', 'API path' );
 	} );
@@ -387,7 +389,7 @@
 			'Default modules', 't-rldm-nonexistent', 'List of all default modules ', 'd', '#t-rl-nonexistent' );
 		assert.strictEqual(
 			tbRLDMnonexistentid,
-			$( '#p-test-tb li:last' )[ 0 ],
+			$( '#p-test-tb li' ).last()[ 0 ],
 			'Next node as non-matching CSS selector falls back to appending'
 		);
 
@@ -395,7 +397,7 @@
 			'Default modules', 't-rldm-empty-jquery', 'List of all default modules ', 'd', $( '#t-rl-nonexistent' ) );
 		assert.strictEqual(
 			tbRLDMemptyjquery,
-			$( '#p-test-tb li:last' )[ 0 ],
+			$( '#p-test-tb li' ).last()[ 0 ],
 			'Next node as empty jQuery object falls back to appending'
 		);
 	} );