git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'bug7531' of https://github.com/csnover/jquery into csnover-bug7531
[jquery.git]
/
test
/
unit
/
ajax.js
diff --git
a/test/unit/ajax.js
b/test/unit/ajax.js
index
b0c399b
..
a0f3d49
100644
(file)
--- a/
test/unit/ajax.js
+++ b/
test/unit/ajax.js
@@
-710,10
+710,10
@@
test("jQuery.getScript(String, Function) - no callback", function() {
});
test("jQuery.ajax() - JSONP, Local", function() {
});
test("jQuery.ajax() - JSONP, Local", function() {
- expect(8);
+ expect(9);
var count = 0;
var count = 0;
- function plus(){ if ( ++count == 8 ) start(); }
+ function plus(){ if ( ++count == 9 ) start(); }
stop();
stop();
@@
-828,6
+828,17
@@
test("jQuery.ajax() - JSONP, Local", function() {
plus();
}
});
plus();
}
});
+
+ //#7578
+ jQuery.ajax({
+ url: "data/jsonp.php",
+ dataType: "jsonp",
+ beforeSend: function(){
+ strictEqual( this.cache, false, "cache must be false on JSON request" );
+ plus();
+ return false;
+ }
+ });
});
test("JSONP - Custom JSONP Callback", function() {
});
test("JSONP - Custom JSONP Callback", function() {