Merge "build: Enable altered jscs rule 'disallowQuotedKeysInObjects' and make pass"

diff --combined tests/qunit/suites/resources/mediawiki/mediawiki.jqueryMsg.test.js
index 0cd8ac0,1fc1b0e..1e2e172
--- 1/tests/qunit/suites/resources/mediawiki/mediawiki.jqueryMsg.test.js
--- 2/tests/qunit/suites/resources/mediawiki/mediawiki.jqueryMsg.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.jqueryMsg.test.js
@@@ -388,7 -388,7 +388,7 @@@
                        'Bar in anchor'
                );
  
 -              expectedSpecialCharacters = '<a title="&quot;Who&quot; wants to be a millionaire &amp; live on &#039;Exotic Island&#039;?" href="/wiki/%22Who%22_wants_to_be_a_millionaire_%26_live_on_%27Exotic_Island%27%3F">&quot;Who&quot; wants to be a millionaire &amp; live on &#039;Exotic Island&#039;?</a>';
 +              expectedSpecialCharacters = '<a title="&quot;Who&quot; wants to be a millionaire &amp; live on &#039;Exotic Island&#039;?" href="/wiki/%22Who%22_wants_to_be_a_millionaire_%26_live_on_&#039;Exotic_Island&#039;%3F">&quot;Who&quot; wants to be a millionaire &amp; live on &#039;Exotic Island&#039;?</a>';
  
                mw.messages.set( 'special-characters', '[[' + specialCharactersPageName + ']]' );
                assert.htmlEqual(
@@@ -513,7 -513,7 +513,7 @@@
                        'curly-brace': '{{int:message}}',
                        'single-square-bracket': '[https://www.mediawiki.org/ MediaWiki]',
                        'double-square-bracket': '[[Some page]]',
-                       'regular': 'Other message'
+                       regular: 'Other message'
                } );
  
                oldGMF = mw.jqueryMsg.getMessageFunction;

diff --combined tests/qunit/suites/resources/mediawiki/mediawiki.util.test.js
index d70d1d0,c1f1484..01fa212
--- 1/tests/qunit/suites/resources/mediawiki/mediawiki.util.test.js
--- 2/tests/qunit/suites/resources/mediawiki/mediawiki.util.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.util.test.js
@@@ -83,7 -83,7 +83,7 @@@
                },
                messages: {
                        // Used by accessKeyLabel in test for addPortletLink
-                       'brackets': '[$1]',
+                       brackets: '[$1]',
                        'word-separator': ' '
                }
        } ) );
@@@ -92,7 -92,7 +92,7 @@@
                assert.equal( mw.util.rawurlencode( 'Test:A & B/Here' ), 'Test%3AA%20%26%20B%2FHere' );
        } );
  
 -      QUnit.test( 'wikiUrlencode', 11, function ( assert ) {
 +      QUnit.test( 'wikiUrlencode', 10, function ( assert ) {
                assert.equal( mw.util.wikiUrlencode( 'Test:A & B/Here' ), 'Test:A_%26_B/Here' );
                // See also wfUrlencodeTest.php#provideURLS
                $.each( {
@@@ -100,11 -100,12 +100,11 @@@
                        '&': '%26',
                        '=': '%3D',
                        ':': ':',
 -                      ';@$-_.!*': ';@$-_.!*',
 +                      ';@$-_.!*\'': ';@$-_.!*\'',
                        '/': '/',
                        '~': '~',
                        '[]': '%5B%5D',
 -                      '<>': '%3C%3E',
 -                      '\'': '%27'
 +                      '<>': '%3C%3E'
                }, function ( input, output ) {
                        assert.equal( mw.util.wikiUrlencode( input ), output );
                } );
@@@ -133,10 -134,10 +133,10 @@@
  
        QUnit.test( 'wikiScript', 4, function ( assert ) {
                mw.config.set( {
-                       'wgScript': '/w/i.php', // customized wgScript for bug 39103
-                       'wgLoadScript': '/w/l.php', // customized wgLoadScript for bug 39103
-                       'wgScriptPath': '/w',
-                       'wgScriptExtension': '.php'
+                       wgScript: '/w/i.php', // customized wgScript for bug 39103
+                       wgLoadScript: '/w/l.php', // customized wgLoadScript for bug 39103
+                       wgScriptPath: '/w',
+                       wgScriptExtension: '.php'
                } );
  
                assert.equal( mw.util.wikiScript(), mw.config.get( 'wgScript' ),
@@@ -175,10 -176,10 +175,10 @@@
                url = 'http://example.org/#&foo=bad';
                assert.strictEqual( mw.util.getParamValue( 'foo', url ), null, 'Ignore hash if param is not in querystring but in hash (bug 27427)' );
  
-               url = 'example.org?' + $.param( { 'TEST': 'a b+c' } );
+               url = 'example.org?' + $.param( { TEST: 'a b+c' } );
                assert.strictEqual( mw.util.getParamValue( 'TEST', url ), 'a b+c', 'Bug 30441: getParamValue must understand "+" encoding of space' );
  
-               url = 'example.org?' + $.param( { 'TEST': 'a b+c d' } ); // check for sloppy code from r95332 :)
+               url = 'example.org?' + $.param( { TEST: 'a b+c d' } ); // check for sloppy code from r95332 :)
                assert.strictEqual( mw.util.getParamValue( 'TEST', url ), 'a b+c d', 'Bug 30441: getParamValue must understand "+" encoding of space (multiple spaces)' );
        } );