diff options
author | jaubourg <j@ubourg.net> | 2011-01-31 19:14:06 +0100 |
---|---|---|
committer | jaubourg <j@ubourg.net> | 2011-01-31 19:14:06 +0100 |
commit | e0b1bb8e3d66db4166ac7ee2146903bae7ab1eb9 (patch) | |
tree | 648ac28dd11a02536db15f56fce0be20bfbb02b6 /test | |
parent | f286a716d5e5836b8508eb5771624de0aafdb235 (diff) | |
download | jquery-e0b1bb8e3d66db4166ac7ee2146903bae7ab1eb9.tar.gz jquery-e0b1bb8e3d66db4166ac7ee2146903bae7ab1eb9.zip |
Script dataType now supports ecmascript mimetypes.
Diffstat (limited to 'test')
-rw-r--r-- | test/data/script.php | 6 | ||||
-rw-r--r-- | test/unit/ajax.js | 22 |
2 files changed, 19 insertions, 9 deletions
diff --git a/test/data/script.php b/test/data/script.php index 55d7bc209..fb7110491 100644 --- a/test/data/script.php +++ b/test/data/script.php @@ -1,7 +1,11 @@ <?php error_reporting(0); if ( $_REQUEST['header'] ) { - header("Content-type: text/javascript"); + if ( $_REQUEST['header'] == "ecma" ) { + header("Content-type: application/ecmascript"); + } else { + header("Content-type: text/javascript"); + } } ?> ok( true, "Script executed correctly." ); diff --git a/test/unit/ajax.js b/test/unit/ajax.js index 31b319c37..33f278274 100644 --- a/test/unit/ajax.js +++ b/test/unit/ajax.js @@ -1558,17 +1558,23 @@ test("jQuery.ajax() - malformed JSON", function() { }); test("jQuery.ajax() - script by content-type", function() { - expect(1); + expect(2); stop(); - jQuery.ajax({ - url: "data/script.php", - data: { header: "script" }, - success: function() { - start(); - } - }); + jQuery.when( + + jQuery.ajax({ + url: "data/script.php", + data: { header: "script" } + }), + + jQuery.ajax({ + url: "data/script.php", + data: { header: "ecma" } + }) + + ).then( start, start ); }); test("jQuery.ajax() - json by content-type", function() { |