github/jquery
1
1
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2026-02-01 15:15:00 -05:00
Code Issues Packages Projects Releases Wiki Activity

Tests: Fix failing ajax tests in oldIE

Browse Source
This commit is contained in:
Oleg Gaidarenko
2014-04-04 22:31:38 +04:00
parent 4d5596e3e4
commit d89c278a33
5 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/data/test.html
View File

@@ -3,5 +3,5 @@ html text<br/>
testFoo = "foo"; jQuery('#foo').html('foo');
ok( true, "test.html executed" );
/* ]]> */</script>
<script src="data/test.js"></script>
<script src="data/testbar.php"></script>
blabla

4
test/data/test.php
View File

@@ -3,5 +3,5 @@ html text<br/>
testFoo = "foo"; jQuery('#foo').html('foo');
ok( true, "test.php executed" );
/* ]]> */</script>
<script src="data/test.js?<?php srand(); echo time() . '' . rand(); ?>"></script>
blabla
<script src="data/testbar.php?<?php srand(); echo time() . '' . rand(); ?>"></script>
blabla

2
test/data/test.js → test/data/testbar.php
View File

@@ -1,3 +1,3 @@
this.testBar = "bar";
jQuery("#ap").html("bar");
ok( true, "test.js executed");
ok( true, "testbar.php executed");

22
test/unit/ajax.js
View File

@@ -602,7 +602,7 @@ module( "ajax", {
ok( jQuery.get( url(target), success ), "get" );
ok( jQuery.post( url(target), success ), "post" );
ok( jQuery.getScript( url("data/test.js"), success ), "script" );
ok( jQuery.getScript( url("data/testbar.php"), success ), "script" );
ok( jQuery.getJSON( url("data/json_obj.js"), success ), "json" );
ok( jQuery.ajax({
url: url( target ),
@@ -850,7 +850,7 @@ module( "ajax", {
setup: function() {
Globals.register("testBar");
},
url: window.location.href.replace( /[^\/]*$/, "" ) + "data/test.js",
url: window.location.href.replace( /[^\/]*$/, "" ) + "data/testbar.php",
dataType: "script",
success: function() {
strictEqual( window["testBar"], "bar", "Script results returned (GET, no callback)" );
@@ -861,7 +861,7 @@ module( "ajax", {
setup: function() {
Globals.register("testBar");
},
url: window.location.href.replace( /[^\/]*$/, "" ) + "data/test.js",
url: window.location.href.replace( /[^\/]*$/, "" ) + "data/testbar.php",
type: "POST",
dataType: "script",
success: function( data, status ) {
@@ -874,7 +874,7 @@ module( "ajax", {
setup: function() {
Globals.register("testBar");
},
url: window.location.href.replace( /[^\/]*$/, "" ).replace( /^.*?\/\//, "//" ) + "data/test.js",
url: window.location.href.replace( /[^\/]*$/, "" ).replace( /^.*?\/\//, "//" ) + "data/testbar.php",
dataType: "script",
success: function() {
strictEqual( window["testBar"], "bar", "Script results returned (GET, no callback)" );
@@ -1776,7 +1776,7 @@ module( "ajax", {
asyncTest( "jQuery.getScript( String, Function ) - with callback", 2, function() {
Globals.register("testBar");
jQuery.getScript( url("data/test.js"), function() {
jQuery.getScript( url("data/testbar.php"), function() {
strictEqual( window["testBar"], "bar", "Check if script was evaluated" );
start();
});
@@ -1784,12 +1784,12 @@ module( "ajax", {
asyncTest( "jQuery.getScript( String, Function ) - no callback", 1, function() {
Globals.register("testBar");
jQuery.getScript( url("data/test.js") ).done( start );
jQuery.getScript( url("data/testbar.php") ).done( start );
});
asyncTest( "#8082 - jQuery.getScript( String, Function ) - source as responseText", 2, function() {
Globals.register("testBar");
jQuery.getScript( url("data/test.js"), function( data, _, jqXHR ) {
jQuery.getScript( url("data/testbar.php"), function( data, _, jqXHR ) {
strictEqual( data, jqXHR.responseText, "Same-domain script requests returns the source of the script" );
start();
});
@@ -2017,7 +2017,9 @@ module( "ajax", {
strictEqual( data, "test%5Blength%5D=7&test%5Bfoo%5D=bar", "Check if a sub-object with a length param is serialized correctly" );
}
})
).always( start );
).always(function() {
start();
});
});
asyncTest( "jQuery.post( String, Hash, Function ) - simple with xml", 4, function() {
@@ -2040,7 +2042,9 @@ module( "ajax", {
strictEqual( jQuery( "result", this ).text(), "3", "Check for XML" );
});
})
).always( start );
).always(function() {
start();
});
});
//----------- jQuery.active

2
test/unit/manipulation.js
View File

@@ -2348,7 +2348,7 @@ test( "script evaluation (#11795)", function() {
if ( jQuery.ajax ) {
Globals.register("testBar");
jQuery("#qunit-fixture").append( "<script src='" + url("data/test.js") + "'/>" );
jQuery("#qunit-fixture").append( "<script src='" + url("data/testbar.php") + "'/>" );
strictEqual( window["testBar"], "bar", "Global script evaluation" );
} else {
ok( true, "No jQuery.ajax" );