git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed errorThrown test for 404 responses seeing as Safari 3.x XHR sets the statusTe...
[jquery.git]
/
test
/
unit
/
ajax.js
diff --git
a/test/unit/ajax.js
b/test/unit/ajax.js
index
2624b55
..
ec28b7c
100644
(file)
--- a/
test/unit/ajax.js
+++ b/
test/unit/ajax.js
@@
-242,7
+242,7
@@
test("jQuery.ajax() - error callbacks", function() {
test("jQuery.ajax() - textStatus and errorThrown values", function() {
test("jQuery.ajax() - textStatus and errorThrown values", function() {
- var nb = 3;
+ var nb = 2;
expect( 2 * nb );
stop();
expect( 2 * nb );
stop();
@@
-253,6
+253,11
@@
test("jQuery.ajax() - textStatus and errorThrown values", function() {
}
}
}
}
+ /*
+ Safari 3.x returns "OK" instead of "Not Found"
+ Safari 4.x doesn't have this issue so the test should be re-instated once
+ we drop support for 3.x
+
jQuery.ajax({
url: url("data/nonExistingURL"),
error: function( _ , textStatus , errorThrown ){
jQuery.ajax({
url: url("data/nonExistingURL"),
error: function( _ , textStatus , errorThrown ){
@@
-261,6
+266,7
@@
test("jQuery.ajax() - textStatus and errorThrown values", function() {
startN();
}
});
startN();
}
});
+ */
jQuery.ajax({
url: url("data/name.php?wait=5"),
jQuery.ajax({
url: url("data/name.php?wait=5"),
@@
-1192,10
+1198,11
@@
test("jQuery.get(String, Hash, Function) - parse xml and use text() on nodes", f
});
test("jQuery.getScript(String, Function) - with callback", function() {
});
test("jQuery.getScript(String, Function) - with callback", function() {
- expect(2);
+ expect(3);
stop();
stop();
- jQuery.getScript(url("data/test.js"), function() {
+ jQuery.getScript(url("data/test.js"), function( data, _, jXHR ) {
equals( foobar, "bar", 'Check if script was evaluated' );
equals( foobar, "bar", 'Check if script was evaluated' );
+ strictEqual( data, jXHR.responseText, "Same-domain script requests returns the source of the script (#8082)" );
setTimeout(start, 100);
});
});
setTimeout(start, 100);
});
});