From: Timo Tijhof Date: Sun, 25 Nov 2012 19:30:16 +0000 (+0100) Subject: Make compatible with jshint, lint test/data. Close gh-1043. X-Git-Tag: 1.9.0b1~48 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=5dd8a90f734297d51ef74a6c4be23c2a4e43c4df;p=jquery.git Make compatible with jshint, lint test/data. Close gh-1043. --- diff --git a/.jshintrc b/.jshintrc index 5ff1e697d..4f0431ddc 100644 --- a/.jshintrc +++ b/.jshintrc @@ -1,16 +1,14 @@ { - "options": { - "curly": true, - "eqeqeq": true, - "eqnull": true, - "expr": true, - "latedef": true, - "noarg": true, - "node": true, - "quotmark": "double", - "smarttabs": true, - "trailing": true, - "undef": true, - "unused": true - } + "curly": true, + "eqeqeq": true, + "latedef": true, + "noarg": true, + "noempty": true, + "quotmark": "double", + "undef": true, + "unused": true, + "strict": true, + "trailing": true, + + "node": true } diff --git a/grunt.js b/grunt.js index dad96b77d..90dd7d69a 100644 --- a/grunt.js +++ b/grunt.js @@ -2,7 +2,6 @@ * Resources * * https://gist.github.com/2489540 - * */ module.exports = function( grunt ) { @@ -82,7 +81,8 @@ module.exports = function( grunt ) { lint: { dist: "dist/jquery.js", grunt: "grunt.js", - tests: "test/unit/**/*.js" + // TODO: Once .jshintignore is supported, use that instead. + tests: ["test/data/{test,testinit,testrunner}.js", "test/unit/**/*.js"] }, jshint: (function() { @@ -91,9 +91,15 @@ module.exports = function( grunt ) { } return { - grunt: jshintrc(), - dist: jshintrc( "src/" ), - tests: jshintrc( "test/" ) + grunt: { + options: jshintrc() + }, + dist: { + options: jshintrc( "src/" ) + }, + tests: { + options: jshintrc( "test/" ) + } }; })(), diff --git a/src/.jshintrc b/src/.jshintrc index daffbf5cc..72a58de2e 100644 --- a/src/.jshintrc +++ b/src/.jshintrc @@ -1,32 +1,24 @@ { - "options": { - "browser": true, - "curly": true, - "eqnull": true, - "evil": true, - "expr": true, - "maxerr": 100, - "newcap": false, - "quotmark": "double", - "regexdash": true, - "strict": true, - "sub": true, - "trailing": true, - "undef": true, - "unused": true, - "wsh": true - }, - "globals": { - "define": true, - "DOMParser": true, - "__dirname": true, - "jQuery": true, - "global": true, - "module": true, - "exports": true, - "require": true, - "file": true, - "log": true, - "console": true - } + "curly": true, + "expr": true, + "newcap": false, + "quotmark": "double", + "regexdash": true, + "strict": true, + "trailing": true, + "undef": true, + "unused": true, + "maxerr": 100, + + "eqnull": true, + "evil": true, + "sub": true, + + "browser": true, + "wsh": true, + + "predef": [ + "define", + "jQuery" + ] } diff --git a/test/.jshintignore b/test/.jshintignore new file mode 100644 index 000000000..ba90d81de --- /dev/null +++ b/test/.jshintignore @@ -0,0 +1,3 @@ +qunit/ +data/badjson.js +data/jquery-1.8.2.ajax_xhr.min.js diff --git a/test/.jshintrc b/test/.jshintrc index 2dd668c3f..76e215f1e 100644 --- a/test/.jshintrc +++ b/test/.jshintrc @@ -1,61 +1,55 @@ { - "options": { - "browser": true, - "curly": true, - "devel": true, - "eqnull": true, - "evil": true, - "expr": true, - "maxerr": 100, - "quotmark": "double", - "smarttabs": true, - "sub": true, - "trailing": true, - "undef": true, - "wsh": true - }, - "globals": { - "define": true, - "DOMParser": true, - "__dirname": true, - "jQuery": true, - "global": true, - "module": true, - "exports": true, - "require": true, - "file": true, - "log": true, - "QUnit": true, - "ok": true, - "equal": true, - "test": true, - "asyncTest": true, - "notEqual": true, - "deepEqual": true, - "strictEqual": true, - "notStrictEqual": true, - "start": true, - "stop": true, - "expect": true, - "raises": true, - "ajaxTest": true, - "testIframe": true, - "testIframeWithCallback": true, - "createDashboardXML": true, - "createXMLFragment": true, - "moduleTeardown": true, - "testFoo": true, - "url": true, - "t": true, - "q": true, - "amdDefined": true, - "fireNative": true, - "Globals": true, - "hasPHP": true, - "isLocal": true, - "originaljQuery": true, - "$": true, - "original$": true, - "externalHost": true - } + "curly": true, + "expr": true, + "quotmark": "double", + "trailing": true, + "undef": true, + "maxerr": 100, + + "eqnull": true, + "evil": true, + "smarttabs": true, + "sub": true, + + "browser": true, + "devel": true, + "wsh": true, + + "predef": [ + "DOMParser", + "jQuery", + "QUnit", + "module", + "ok", + "equal", + "test", + "asyncTest", + "notEqual", + "deepEqual", + "strictEqual", + "notStrictEqual", + "start", + "stop", + "expect", + "raises", + "ajaxTest", + "testIframe", + "testIframeWithCallback", + "createDashboardXML", + "createXMLFragment", + "moduleTeardown", + "testFoo", + "url", + "t", + "q", + "amdDefined", + "fireNative", + "Globals", + "hasPHP", + "isLocal", + "originaljQuery", + "$", + "original$", + "externalHost" + ] } diff --git a/test/data/test.js b/test/data/test.js index a18815315..5980bff91 100644 --- a/test/data/test.js +++ b/test/data/test.js @@ -1,3 +1,3 @@ var testBar = "bar"; -jQuery('#ap').html('bar'); +jQuery("#ap").html("bar"); ok( true, "test.js executed"); diff --git a/test/data/testinit.js b/test/data/testinit.js index bff6b8dff..ea940cb63 100644 --- a/test/data/testinit.js +++ b/test/data/testinit.js @@ -1,4 +1,4 @@ -/*jshint multistr:true */ +/*jshint multistr:true, quotmark:false */ var amdDefined, fireNative, originaljQuery = this.jQuery || "jQuery", @@ -207,7 +207,7 @@ function ajaxTest( title, expect, options ) { } }; }); -}; +} (function () { diff --git a/test/data/testrunner.js b/test/data/testrunner.js index ba6b892e3..c9888c383 100644 --- a/test/data/testrunner.js +++ b/test/data/testrunner.js @@ -232,7 +232,7 @@ var Globals = (function() { // Since this method was called it means some data was // expected to be found, but since there is nothing, fail early // (instead of in teardown). - notStrictEqual( expando, undefined, 'Target for expectJqData must have an expando, for else there can be no data to expect.' ); + notStrictEqual( expando, undefined, "Target for expectJqData must have an expando, for else there can be no data to expect." ); } else { if ( expectedDataKeys[expando] ) { expectedDataKeys[expando].push( key ); @@ -243,9 +243,9 @@ var Globals = (function() { } }; QUnit.config.urlConfig.push( { - id: 'jqdata', - label: 'Always check jQuery.data', - tooltip: 'Trigger "QUnit.expectJqData" detection for all tests instead of just the ones that call it' + id: "jqdata", + label: "Always check jQuery.data", + tooltip: "Trigger QUnit.expectJqData detection for all tests instead of just the ones that call it" } ); /** @@ -265,14 +265,14 @@ var Globals = (function() { expectedKeys = expectedDataKeys[i]; actualKeys = jQuery.cache[i] ? keys( jQuery.cache[i] ) : jQuery.cache[i]; if ( !QUnit.equiv( expectedKeys, actualKeys ) ) { - deepEqual( actualKeys, expectedKeys, 'Expected keys exist in jQuery.cache' ); + deepEqual( actualKeys, expectedKeys, "Expected keys exist in jQuery.cache" ); } delete jQuery.cache[i]; delete expectedDataKeys[i]; } // In case it was removed from cache before (or never there in the first place) for ( i in expectedDataKeys ) { - deepEqual( expectedDataKeys[i], undefined, 'No unexpected keys were left in jQuery.cache (#' + i + ')' ); + deepEqual( expectedDataKeys[i], undefined, "No unexpected keys were left in jQuery.cache (#" + i + ")" ); delete expectedDataKeys[i]; } } @@ -359,5 +359,5 @@ QUnit.config.requireExpects = true; return; } - document.write(""); + document.write(""); })();