Merge "qunit: Remove obsolete jshint/jscs options"

tests/qunit/data/generateJqueryMsgData.php

@@ -133,7 +133,6 @@ class GenerateJqueryMsgData extends Maintenance {
 				. "// languages, and parser modes. Intended for use by a unit test framework by looping\n"
 				. "// through the object and comparing its parser return value with the 'result' property.\n"
 				. '// Last generated with ' . basename( __FILE__ ) . ' at ' . gmdate( 'r' ) . "\n"
-				. "//jscs:disable\n"
 				. "\n"
 				. 'mediaWiki.libs.phpParserData = ' . FormatJson::encode( $phpParserData, true ) . ";\n";
 

tests/qunit/data/mediawiki.jqueryMsg.data.js

@@ -2,7 +2,6 @@
 // languages, and parser modes. Intended for use by a unit test framework by looping
 // through the object and comparing its parser return value with the 'result' property.
 // Last generated with generateJqueryMsgData.php at Fri, 10 Jul 2015 11:44:08 +0000
-//jscs:disable
 
 mediaWiki.libs.phpParserData = {
     "messages": {

tests/qunit/suites/resources/jquery/jquery.tablesorter.test.js

@@ -245,7 +245,6 @@
 		$tr.appendTo( $thead );
 
 		for ( i = 0; i < data.length; i++ ) {
-			/*jshint loopfunc: true */
 			$tr = $( '<tr>' );
 			$.each( data[ i ], function ( j, str ) {
 				var $td = $( '<td>' );

tests/qunit/suites/resources/mediawiki/mediawiki.Title.test.js

@@ -101,7 +101,6 @@
 				// testing custom / localized namespace
 				100: 'Penguins'
 			},
-			// jscs: disable requireCamelCaseOrUpperCaseIdentifiers
 			wgNamespaceIds: {
 				media: -2,
 				special: -1,
@@ -129,7 +128,6 @@
 				penguins: 100,
 				antarctic_waterfowl: 100
 			},
-			// jscs: enable requireCamelCaseOrUpperCaseIdentifiers
 			wgCaseSensitiveNamespaces: []
 		}
 	} ) );
@@ -140,7 +138,6 @@
 			title = new mw.Title( cases.valid[ i ] );
 		}
 		for ( i = 0; i < cases.invalid.length; i++ ) {
-			/*jshint loopfunc:true */
 			title = cases.invalid[ i ];
 			assert.throws( function () {
 				return new mw.Title( title );

tests/qunit/suites/resources/mediawiki/mediawiki.Uri.test.js

@@ -132,7 +132,6 @@
 		} );
 		assert.equal( uri.toString(), 'http://example.com/bar/baz', 'normalize URI without protocol or // in loose mode' );
 
-		/*jshint -W001 */
 		uri = new mw.Uri( 'http://example.com/index.php?key=key&hasOwnProperty=hasOwnProperty&constructor=constructor&watch=watch' );
 		assert.deepEqual(
 			uri.query,
@@ -144,7 +143,6 @@
 			},
 			'Keys in query strings support names of Object prototypes (bug T114344)'
 		);
-		/*jshint +W001 */
 	} );
 
 	QUnit.test( 'Constructor( Object )', function ( assert ) {

tests/qunit/suites/resources/mediawiki/mediawiki.jqueryMsg.test.js

@@ -45,7 +45,6 @@
 		},
 		config: {
 			wgArticlePath: '/wiki/$1',
-			// jscs:disable requireCamelCaseOrUpperCaseIdentifiers
 			wgNamespaceIds: {
 				template: 10,
 				template_talk: 11,
@@ -53,7 +52,6 @@
 				szablon: 10,
 				dyskusja_szablonu: 11
 			},
-			// jscs:enable requireCamelCaseOrUpperCaseIdentifiers
 			wgFormattedNamespaces: {
 				// Localised
 				10: 'Szablon',
@@ -126,7 +124,6 @@
 	 *  that may be asynchronous. Invoke the callback parameter when done.
 	 */
 	function process( tasks ) {
-		/*jshint latedef:false */
 		function abort() {
 			tasks.splice( 0, tasks.length );
 			next();