git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Made significant changes to the expression engine. Is now significantly faster (4...
[jquery.git]
/
src
/
ajax
/
ajaxTest.js
diff --git
a/src/ajax/ajaxTest.js
b/src/ajax/ajaxTest.js
index
ad705a1
..
1ae6bbf
100644
(file)
--- a/
src/ajax/ajaxTest.js
+++ b/
src/ajax/ajaxTest.js
@@
-24,7
+24,7
@@
test("param", function() {
test("pass-through request object", function() {
expect(7);
test("pass-through request object", function() {
expect(7);
- stop();
+ stop(true);
var count = 0;
var success = function() {
if(count++ == 6)
var count = 0;
var success = function() {
if(count++ == 6)
@@
-43,6
+43,12
@@
test("synchronous request", function() {
ok( /^{ "data"/.test( $.ajax({url: "data/json.php", async: false}).responseText ), "check returned text" );
});
ok( /^{ "data"/.test( $.ajax({url: "data/json.php", async: false}).responseText ), "check returned text" );
});
+test("synchronous request with callbacks", function() {
+ var result;
+ $.ajax({url: "data/json.php", async: false, success: function(data) { result = data; } });
+ ok( /^{ "data"/.test( result ), "check returned text" );
+});
+
test("load(String, Object, Function) - simple: inject text into DOM", function() {
expect(2);
stop();
test("load(String, Object, Function) - simple: inject text into DOM", function() {
expect(2);
stop();
@@
-54,7
+60,7
@@
test("load(String, Object, Function) - simple: inject text into DOM", function()
test("load(String, Object, Function) - inject without callback", function() {
expect(1);
test("load(String, Object, Function) - inject without callback", function() {
expect(1);
- stop(); // check if load can be called with only url
+ stop(true); // check if load can be called with only url
$('#first').load("data/name.php");
});
$('#first').load("data/name.php");
});
@@
-121,6
+127,7
@@
test("test global handlers - failure", function() {
counter.error = counter.success = counter.complete = counter.send = 0;
$.ajaxTimeout(500);
$.ajax({url: "data/name.php?wait=5", global: false, beforeSend: send, success: success, error: error, complete: function() {
counter.error = counter.success = counter.complete = counter.send = 0;
$.ajaxTimeout(500);
$.ajax({url: "data/name.php?wait=5", global: false, beforeSend: send, success: success, error: error, complete: function() {
+ var x = counter;
ok( counter.error == 1, 'Check failed request without globals' );
ok( counter.success == 0, 'Check failed request without globals' );
ok( counter.complete == 0, 'Check failed request without globals' );
ok( counter.error == 1, 'Check failed request without globals' );
ok( counter.success == 0, 'Check failed request without globals' );
ok( counter.complete == 0, 'Check failed request without globals' );
@@
-164,7
+171,7
@@
test("$.getScript(String, Function) - with callback", function() {
test("$.getScript(String, Function) - no callback", function() {
expect(1);
test("$.getScript(String, Function) - no callback", function() {
expect(1);
- stop();
+ stop(true);
$.getScript("data/test.js");
});
$.getScript("data/test.js");
});
@@
-228,6
+235,8
@@
test("$.ajaxTimeout(Number) - with global timeout", function() {
error: pass,
success: fail
});
error: pass,
success: fail
});
+ // reset timeout
+ $.ajaxTimeout(0);
});
test("$.ajaxTimeout(Number) with localtimeout", function() {
});
test("$.ajaxTimeout(Number) with localtimeout", function() {
@@
-311,16
+320,29
@@
test("$.ajax - xml: non-namespace elements inside namespaced elements", function
test("$.ajax - beforeSend", function() {
expect(1);
stop();
test("$.ajax - beforeSend", function() {
expect(1);
stop();
- var customHeader = "value";
+ var check = false;
$.ajax({
url: "data/name.php",
data: {'req': true},
beforeSend: function(xml) {
$.ajax({
url: "data/name.php",
data: {'req': true},
beforeSend: function(xml) {
- xml.setRequestHeader('X-Custom-Header', customHeader);
+ check = true
},
success: function(data) {
},
success: function(data) {
- ok( data == customHeader, "check return value, should be the custom header sent" );
+ ok( check, "check beforeSend was executed" );
+ start();
+ }
+ });
+});
+
+test("ajaxSetup()", function() {
+ expect(1);
+ stop();
+ $.ajaxSetup({
+ url: "data/name.php?name=foo",
+ success: function(msg){
+ ok( msg == 'bar', 'Check for GET' );
start();
}
});
start();
}
});
-});
\ No newline at end of file
+ $.ajax();
+});