git.asbjorn.biz
/
jquery.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
14e9da5
)
Grouped up the test
author
gnarf
<gnarf@gnarf.net>
Thu, 24 Feb 2011 19:21:05 +0000
(13:21 -0600)
committer
gnarf
<gnarf@gnarf.net>
Thu, 24 Feb 2011 19:21:05 +0000
(13:21 -0600)
test/unit/ajax.js
patch
|
blob
|
history
diff --git
a/test/unit/ajax.js
b/test/unit/ajax.js
index
4ce15f8
..
2a2ac46
100644
(file)
--- a/
test/unit/ajax.js
+++ b/
test/unit/ajax.js
@@
-492,7
+492,7
@@
test(".ajax() - hash", function() {
test("jQuery ajax - cross-domain detection", function() {
test("jQuery ajax - cross-domain detection", function() {
- expect( 4 );
+ expect( 5 );
var loc = document.location,
otherPort = loc.port === 666 ? 667 : 666,
var loc = document.location,
otherPort = loc.port === 666 ? 667 : 666,
@@
-508,6
+508,14
@@
test("jQuery ajax - cross-domain detection", function() {
});
jQuery.ajax({
});
jQuery.ajax({
+ url: 'app:/path',
+ beforeSend: function( _ , s ) {
+ ok( s.crossDomain , "Adobe AIR app:/ URL detected as cross-domain" );
+ return false;
+ }
+ });
+
+ jQuery.ajax({
dataType: "jsonp",
url: loc.protocol + '//somewebsitethatdoesnotexist-656329477541.com:' + ( loc.port || 80 ),
beforeSend: function( _ , s ) {
dataType: "jsonp",
url: loc.protocol + '//somewebsitethatdoesnotexist-656329477541.com:' + ( loc.port || 80 ),
beforeSend: function( _ , s ) {
@@
-2239,18
+2247,6
@@
test("jQuery.ajax - active counter", function() {
ok( jQuery.active == 0, "ajax active counter should be zero: " + jQuery.active );
});
ok( jQuery.active == 0, "ajax active counter should be zero: " + jQuery.active );
});
-test("jQuery.ajax - compatible with AIR urls"), function() {
- expect( 1 );
- stop();
- $.ajax({
- url: "app:/testing",
- beforeSend: function() {
- ok( this.crossDomain, "Detected crossDomain for AIR Url" );
- return false;
- }
- });
-});
-
}
//}
\ No newline at end of file
}
//}
\ No newline at end of file