X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fajax.js;h=2fafcaef72f0509f4ddb3fd1755678d99df256b1;hb=b1018cad1256a7b9cc47e675b2a9e22c409b7aed;hp=62c5ece2d21572d021a9c6b03e7dcca98865c6b0;hpb=9e48649729a5d4cd9ce52bcba067ba33a562cb4b;p=jquery.git

diff --git a/test/unit/ajax.js b/test/unit/ajax.js
index 62c5ece..2fafcae 100644
--- a/test/unit/ajax.js
+++ b/test/unit/ajax.js
@@ -157,19 +157,22 @@ test("jQuery.ajax - beforeSend, cancel request (#2688)", function() {
 	ok( request === false, "canceled request must return false instead of XMLHttpRequest instance" );
 });
 
-var foobar;
-
 test("jQuery.ajax - dataType html", function() {
 	expect(5);
 	stop();
 	
-	foobar = null;
-	testFoo = undefined;
+	window.foobar = null;
+	window.testFoo = undefined;
 
 	var verifyEvaluation = function() {
-	  equals( testFoo, "foo", 'Check if script was evaluated for datatype html' );
-	  equals( foobar, "bar", 'Check if script src was evaluated for datatype html' );
-	  start();
+		equals( testFoo, "foo", 'Check if script was evaluated for datatype html' );
+		equals( foobar, "bar", 'Check if script src was evaluated for datatype html' );
+	  
+		// Cleanup the global namespace
+		delete window.foobar;
+		delete window.testFoo;
+	  
+		start();
 	};
 
 	jQuery.ajax({
@@ -240,23 +243,25 @@ test("synchronous request with callbacks", function() {
 
 test("pass-through request object", function() {
 	expect(8);
-	stop(true);
+	stop();
 	
 	var target = "data/name.html";
 	var successCount = 0;
 	var errorCount = 0;
-  var errorEx = "";
+	var errorEx = "";
 	var success = function() {
 		successCount++;
 	};
 	jQuery("#foo").ajaxError(function (e, xml, s, ex) {
 		errorCount++;
-    errorEx += ": " + xml.status;
+		errorEx += ": " + xml.status;
 	});
 	jQuery("#foo").one('ajaxStop', function () {
 		equals(successCount, 5, "Check all ajax calls successful");
 		equals(errorCount, 0, "Check no ajax errors (status" + errorEx + ")");
 		jQuery("#foo").unbind('ajaxError');
+		
+		delete window.foobar;
 		start();
 	});
 	
@@ -321,13 +326,13 @@ test("global ajaxSettings", function() {
 
 test("load(String)", function() {
 	expect(1);
-	stop(true); // check if load can be called with only url
+	stop(); // check if load can be called with only url
 	jQuery('#first').load("data/name.html", start);
 });
 
 test("load('url selector')", function() {
 	expect(1);
-	stop(true); // check if load can be called with only url
+	stop(); // check if load can be called with only url
 	jQuery('#first').load("data/test3.html div.user", function(){
 		equals( jQuery(this).children("div").length, 2, "Verify that specific elements were injected" );
 		start();
@@ -359,12 +364,19 @@ test("load(String, Function) - simple: inject text into DOM", function() {
 test("load(String, Function) - check scripts", function() {
 	expect(7);
 	stop();
+	
 	window.testFoo = undefined;
 	window.foobar = null;
+	
 	var verifyEvaluation = function() {
 		equals( foobar, "bar", 'Check if script src was evaluated after load' );
 		equals( jQuery('#ap').html(), 'bar', 'Check if script evaluation has modified DOM');
-		 start();
+		
+		// Cleanup the global namespace
+		delete window.foobar;
+		delete window.testFoo;
+		
+		start();
 	};
 	jQuery('#first').load(url('data/test.html'), function() {
 		ok( jQuery('#first').html().match(/^html text/), 'Check content after loading html' );
@@ -377,10 +389,13 @@ test("load(String, Function) - check scripts", function() {
 test("load(String, Function) - check file with only a script tag", function() {
 	expect(3);
 	stop();
-	testFoo = undefined;
+	window.testFoo = undefined;
 	jQuery('#first').load(url('data/test2.html'), function() {
 		equals( jQuery('#foo').html(), 'foo', 'Check if script evaluation has modified DOM');
 		equals( testFoo, "foo", 'Check if script was evaluated after load' );
+		
+		// Cleanup the global namespace
+		delete window.testFoo;
 		start();
 	});
 });
@@ -429,14 +444,18 @@ test("jQuery.getScript(String, Function) - with callback", function() {
 	window.foobar = null;
 	jQuery.getScript(url("data/test.js"), function() {
 		equals( foobar, "bar", 'Check if script was evaluated' );
+		delete window.foobar;
 		setTimeout(start, 100);
 	});
 });
 
 test("jQuery.getScript(String, Function) - no callback", function() {
 	expect(1);
-	stop(true);
-	jQuery.getScript(url("data/test.js"), start);
+	stop();
+	jQuery.getScript(url("data/test.js"), function(){
+		delete window.foobar;
+		start();
+	});
 });
 
 test("jQuery.ajax() - JSONP, Local", function() {
@@ -624,6 +643,7 @@ test("jQuery.ajax() - script, Remote", function() {
 		dataType: "script",
 		success: function(data){
 			ok( foobar, "Script results returned (GET, no callback)" );
+			delete window.foobar;
 			start();
 		}
 	});
@@ -644,6 +664,7 @@ test("jQuery.ajax() - script, Remote with POST", function() {
 		success: function(data, status){
 			ok( foobar, "Script results returned (GET, no callback)" );
 			equals( status, "success", "Script results returned (GET, no callback)" );
+			delete window.foobar;
 			start();
 		}
 	});
@@ -663,6 +684,7 @@ test("jQuery.ajax() - script, Remote with scheme-less URL", function() {
 		dataType: "script",
 		success: function(data){
 			ok( foobar, "Script results returned (GET, no callback)" );
+			delete window.foobar;
 			start();
 		}
 	});
@@ -818,10 +840,11 @@ test("ajaxSetup()", function() {
 	jQuery.ajax();
 });
 
+/*
 test("custom timeout does not set error message when timeout occurs, see #970", function() {
 	stop();
 	jQuery.ajax({
-		url: "data/name.php?wait=10",
+		url: "data/name.php?wait=1",
 		timeout: 500,
 		error: function(request, status) {
 			ok( status != null, "status shouldn't be null in error handler" );
@@ -830,6 +853,7 @@ test("custom timeout does not set error message when timeout occurs, see #970",
 		}
 	});
 });
+*/
 
 test("data option: evaluate function values (#2806)", function() {
 	stop();