Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -79,7 +79,7 @@ module.exports = function( grunt ) { | |
| "dist/jquery.min.js": [ "<banner>", "dist/jquery.js" ] | ||
| }, | ||
| lint: { | ||
| files: [ "test/unit/**/*.js", "grunt.js", "dist/jquery.js" ] | ||
| }, | ||
| qunit: { | ||
| files: "test/index.html" | ||
|
|
@@ -99,22 +99,50 @@ module.exports = function( grunt ) { | |
| trailing: true, | ||
| undef: true, | ||
| smarttabs: true, | ||
| maxerr: 100 | ||
| }, | ||
| globals: { | ||
| define: true, | ||
| DOMParser: true, | ||
| __dirname: true, | ||
| jQuery: true, | ||
| global: true, | ||
| module: true, | ||
| exports: true, | ||
| require: true, | ||
| file: true, | ||
| log: true, | ||
| console: true, | ||
| QUnit: true, | ||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong. 
rwaldron
Author
Member
|
||
| ok: true, | ||
| equal: true, | ||
| test: true, | ||
| asyncTest: true, | ||
| notEqual: true, | ||
| deepEqual: true, | ||
| strictEqual: true, | ||
| notStrictEqual: true, | ||
| start: true, | ||
| stop: true, | ||
| expect: true, | ||
| raises: true, | ||
| testIframe: true, | ||
| testIframeWithCallback: true, | ||
| createDashboardXML: true, | ||
| moduleTeardown: true, | ||
| testFoo: true, | ||
| foobar: true, | ||
| url: true, | ||
| t: true, | ||
| q: true, | ||
| amdDefined: true, | ||
| fireNative: true, | ||
| hasPHP: true, | ||
| isLocal: true, | ||
| originaljQuery: true, | ||
| "$": true, | ||
| "original$": true | ||
|
|
||
| } | ||
| }, | ||
| uglify: {} | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -381,7 +381,7 @@ test(".ajax() - headers" , function() { | |
|
|
||
| headers: requestHeaders, | ||
| success: function( data , _ , xhr ) { | ||
| var tmp = [], i; | ||
| for ( i in requestHeaders ) { | ||
| tmp.push( i , ": " , requestHeaders[ i ] , "\n" ); | ||
| } | ||
|
|
@@ -1000,7 +1000,7 @@ test("jQuery.param()", function() { | |
|
|
||
| jQuery.ajaxSetup({ traditional: true }); | ||
|
|
||
| params = {foo:"bar", baz:42, quux:"All your base are belong to us"}; | ||
| equal( jQuery.param(params), "foo=bar&baz=42&quux=All+your+base+are+belong+to+us", "simple" ); | ||
|
|
||
| params = {someName: [1, 2, 3], regularThing: "blah" }; | ||
|
|
@@ -1038,10 +1038,13 @@ test("jQuery.param() Constructed prop values", function() { | |
| this.prop = "val"; | ||
| } | ||
|
|
||
| var MyString = String, | ||
| MyNumber = Number, | ||
This comment has been minimized.
Sorry, something went wrong. 
Krinkle
Member
|
||
| params = { "test": new MyString("foo") }; | ||
|
|
||
| equal( jQuery.param( params, false ), "test=foo", "Do not mistake new String() for a plain object" ); | ||
|
|
||
| params = { "test": new MyNumber(5) }; | ||
This comment has been minimized.
Sorry, something went wrong. 
martin-g
|
||
| equal( jQuery.param( params, false ), "test=5", "Do not mistake new Number() for a plain object" ); | ||
|
|
||
| params = { "test": new Date() }; | ||
|
|
@@ -1054,14 +1057,20 @@ test("jQuery.param() Constructed prop values", function() { | |
|
|
||
| test("synchronous request", function() { | ||
| expect(1); | ||
| var response = jQuery.ajax({ | ||
| url: url("data/json_obj.js"), | ||
| dataType: "text", | ||
| async: false | ||
| }).responseText; | ||
|
|
||
| ok( /^\{ "data"/.test( response ), "check returned text" ); | ||
| }); | ||
|
|
||
| test("synchronous request with callbacks", function() { | ||
| expect(2); | ||
| var result; | ||
| jQuery.ajax({url: url("data/json_obj.js"), async: false, dataType: "text", success: function(data) { ok(true, "sucess callback executed"); result = data; } }); | ||
| ok( /^\{ "data"/.test( result ), "check returned text" ); | ||
| }); | ||
|
|
||
| test("pass-through request object", function() { | ||
|
|
@@ -1113,8 +1122,9 @@ test("ajax cache", function () { | |
| } | ||
| equal(i, 1, "Test to make sure only one 'no-cache' parameter is there"); | ||
| ok(oldOne != "tobereplaced555", "Test to be sure parameter (if it was there) was replaced"); | ||
| if(++count == 6) { | ||
| start(); | ||
| } | ||
| }); | ||
|
|
||
| ok( jQuery.ajax({url: "data/text.php", cache:false}), "test with no parameters" ); | ||
|
|
@@ -1372,7 +1382,11 @@ jQuery.each( [ "Same Domain", "Cross Domain" ] , function( crossDomain , label ) | |
| expect(24); | ||
|
|
||
| var count = 0; | ||
| function plus(){ | ||
| if ( ++count == 20 ) { | ||
| start(); | ||
| } | ||
| } | ||
|
|
||
| stop(); | ||
|
|
||
|
|
@@ -1858,19 +1872,19 @@ test("jQuery.getJSON(String, Function) - JSON object", function() { | |
| }); | ||
| }); | ||
|
|
||
| asyncTest("jQuery.getJSON - Using Native JSON", function() { | ||
| expect(2); | ||
|
|
||
| var old = window.JSON; | ||
|
|
||
| window.JSON = { | ||
| parse: function(str) { | ||
| ok( true, "Verifying that parse method was run" ); | ||
| return true; | ||
| } | ||
| }; | ||
|
|
||
| jQuery.getJSON(url("data/json.php"), function( json ) { | ||
| window.JSON = old; | ||
| equal( json, true, "Verifying return value" ); | ||
| start(); | ||
|
|
@@ -1930,15 +1944,19 @@ test("jQuery.post(String, Hash, Function) - simple with xml", function() { | |
| equal( jQuery("calculation", this).text(), "5-2", "Check for XML" ); | ||
| equal( jQuery("result", this).text(), "3", "Check for XML" ); | ||
| }); | ||
| if ( ++done === 2 ) { | ||
| start(); | ||
| } | ||
| }); | ||
|
|
||
| jQuery.post(url("data/name.php?xml=5-2"), {}, function(xml){ | ||
| jQuery("math", xml).each(function() { | ||
| equal( jQuery("calculation", this).text(), "5-2", "Check for XML" ); | ||
| equal( jQuery("result", this).text(), "3", "Check for XML" ); | ||
| }); | ||
| if ( ++done === 2 ) { | ||
| start(); | ||
| } | ||
| }); | ||
| }); | ||
|
|
||
|
|
@@ -2196,14 +2214,22 @@ test("jQuery ajax - failing cross-domain", function() { | |
| url: "http://somewebsitethatdoesnotexist-67864863574657654.com", | ||
| success: function(){ ok( false , "success" ); }, | ||
| error: function(xhr,_,e){ ok( true , "file not found: " + xhr.status + " => " + e ); }, | ||
| complete: function() { | ||
| if ( ! --i ) { | ||
| start(); | ||
| } | ||
| } | ||
| }); | ||
|
|
||
| jQuery.ajax({ | ||
| url: "http://www.google.com", | ||
| success: function(){ ok( false , "success" ); }, | ||
| error: function(xhr,_,e){ ok( true , "access denied: " + xhr.status + " => " + e ); }, | ||
| complete: function() { | ||
| if ( ! --i ) { | ||
| start(); | ||
| } | ||
| } | ||
| }); | ||
|
|
||
| }); | ||
|
|
@@ -2498,7 +2524,7 @@ test( "jQuery.domManip - script in comments are properly evaluated (#11402)", fu | |
| }); | ||
|
|
||
| test("jQuery.ajax - active counter", function() { | ||
| ok( jQuery.active === 0, "ajax active counter should be zero: " + jQuery.active ); | ||
| }); | ||
|
|
||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
4 comments
on commit 7ff3da1
There was a problem hiding this comment.
BRAVO.
There was a problem hiding this comment.
Nice work!
There was a problem hiding this comment.
Thanks guys :)
There was a problem hiding this comment.
👍👍👍👍👍👍
You should really split this into multiple lint tasks so that you can keep the test-only globals separate.