Commit 3f515045 authored by Richard Gibson's avatar Richard Gibson

No ticket: remove test suite external dependencies

parent 395f1da7
...@@ -54,6 +54,7 @@ ...@@ -54,6 +54,7 @@
"isLocal": true, "isLocal": true,
"originaljQuery": true, "originaljQuery": true,
"$": true, "$": true,
"original$": true "original$": true,
"externalHost": true,
} }
} }
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<script> <script>
var script = document.getElementsByTagName( "script" )[ 0 ], var script = document.getElementsByTagName( "script" )[ 0 ],
div = document.createElement( "div" ), div = document.createElement( "div" ),
src = "http://google.com", src = "http://" + window.parent.externalHost,
success = true, success = true,
error = ""; error = "";
...@@ -31,6 +31,6 @@ ...@@ -31,6 +31,6 @@
( error ? ": " + error : "" ) ( error ? ": " + error : "" )
}); });
}); });
</script> </script>
</body> </body>
</html> </html>
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<style> <style>
body { body {
background: url('http://s1.postimage.org/2d2r8xih0/body_background.png'); background: url('../1x1.jpg');
} }
</style> </style>
<script src="../../../dist/jquery.js"></script> <script src="../../../dist/jquery.js"></script>
......
/*jshint multistr:true */ /*jshint multistr:true */
var originaljQuery = this.jQuery || "jQuery", var amdDefined, fireNative,
originaljQuery = this.jQuery || "jQuery",
original$ = this.$ || "$", original$ = this.$ || "$",
hasPHP = true, hasPHP = true,
// Disable Ajax tests to reduce network strain
// Re-enabled (at least the variable should be declared)
isLocal = window.location.protocol === "file:", isLocal = window.location.protocol === "file:",
amdDefined; // see RFC 2606
externalHost = "example.com";
// For testing .noConflict() // For testing .noConflict()
this.jQuery = originaljQuery; this.jQuery = originaljQuery;
...@@ -58,7 +58,7 @@ function t( a, b, c ) { ...@@ -58,7 +58,7 @@ function t( a, b, c ) {
deepEqual(f, q.apply( q, c ), a + " (" + b + ")"); deepEqual(f, q.apply( q, c ), a + " (" + b + ")");
} }
var createDashboardXML = function() { function createDashboardXML() {
var string = '<?xml version="1.0" encoding="UTF-8"?> \ var string = '<?xml version="1.0" encoding="UTF-8"?> \
<dashboard> \ <dashboard> \
<locations class="foo"> \ <locations class="foo"> \
...@@ -74,17 +74,17 @@ var createDashboardXML = function() { ...@@ -74,17 +74,17 @@ var createDashboardXML = function() {
return jQuery.parseXML(string); return jQuery.parseXML(string);
}; };
var createWithFriesXML = function() { function createWithFriesXML() {
var string = '<?xml version="1.0" encoding="UTF-8"?> \ var string = '<?xml version="1.0" encoding="UTF-8"?> \
<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" \ <soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" \
xmlns:xsd="http://www.w3.org/2001/XMLSchema" \ xmlns:xsd="http://www.w3.org/2001/XMLSchema" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> \ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> \
<soap:Body> \ <soap:Body> \
<jsconf xmlns="http://www.example.com/ns1"> \ <jsconf xmlns="http://{{ externalHost }}/ns1"> \
<response xmlns:ab="http://www.example.com/ns2"> \ <response xmlns:ab="http://{{ externalHost }}/ns2"> \
<meta> \ <meta> \
<component id="seite1" class="component"> \ <component id="seite1" class="component"> \
<properties xmlns:cd="http://www.example.com/ns3"> \ <properties xmlns:cd="http://{{ externalHost }}/ns3"> \
<property name="prop1"> \ <property name="prop1"> \
<thing /> \ <thing /> \
<value>1</value> \ <value>1</value> \
...@@ -101,10 +101,10 @@ var createWithFriesXML = function() { ...@@ -101,10 +101,10 @@ var createWithFriesXML = function() {
</soap:Body> \ </soap:Body> \
</soap:Envelope>'; </soap:Envelope>';
return jQuery.parseXML(string); return jQuery.parseXML( string.replace( /\{\{\s*externalHost\s*\}\}/g, externalHost ) );
}; };
var createXMLFragment = function() { function createXMLFragment() {
var xml, frag; var xml, frag;
if ( window.ActiveXObject ) { if ( window.ActiveXObject ) {
xml = new ActiveXObject("msxml2.domdocument"); xml = new ActiveXObject("msxml2.domdocument");
...@@ -119,19 +119,16 @@ var createXMLFragment = function() { ...@@ -119,19 +119,16 @@ var createXMLFragment = function() {
return frag; return frag;
}; };
var fireNative; fireNative = document.createEvent ?
if ( document.createEvent ) { function( node, type ) {
fireNative = function( node, type ) {
var event = document.createEvent('HTMLEvents'); var event = document.createEvent('HTMLEvents');
event.initEvent( type, true, true ); event.initEvent( type, true, true );
node.dispatchEvent( event ); node.dispatchEvent( event );
}; } :
} else { function( node, type ) {
fireNative = function( node, type ) {
var event = document.createEventObject(); var event = document.createEventObject();
node.fireEvent( 'on' + type, event ); node.fireEvent( 'on' + type, event );
}; };
}
/** /**
* Add random number to url to stop caching * Add random number to url to stop caching
...@@ -201,6 +198,8 @@ function url( value ) { ...@@ -201,6 +198,8 @@ function url( value ) {
).appendTo( "body" ); ).appendTo( "body" );
}); });
}; };
window.iframeCallback = undefined;
}()); }());
// Sandbox start for great justice // Sandbox start for great justice
......
...@@ -3,11 +3,11 @@ ...@@ -3,11 +3,11 @@
xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<soap:Body> <soap:Body>
<jsconf xmlns="http://www.example.com/ns1"> <jsconf xmlns="http://example.com/ns1">
<response xmlns:ab="http://www.example.com/ns2"> <response xmlns:ab="http://example.com/ns2">
<meta> <meta>
<component id="seite1" class="component"> <component id="seite1" class="component">
<properties xmlns:cd="http://www.example.com/ns3"> <properties xmlns:cd="http://example.com/ns3">
<property name="prop1"> <property name="prop1">
<thing /> <thing />
<value>1</value> <value>1</value>
......
...@@ -621,7 +621,7 @@ if ( jQuery.ajax && ( !isLocal || hasPHP ) ) { ...@@ -621,7 +621,7 @@ if ( jQuery.ajax && ( !isLocal || hasPHP ) ) {
jQuery.ajax({ jQuery.ajax({
dataType: "jsonp", dataType: "jsonp",
url: loc.protocol + "//somewebsitethatdoesnotexist-656329477541.com:" + ( loc.port || 80 ), url: loc.protocol + "//example.invalid:" + ( loc.port || 80 ),
beforeSend: function( _, s ) { beforeSend: function( _, s ) {
ok( s.crossDomain, "Test different hostnames are detected as cross-domain" ); ok( s.crossDomain, "Test different hostnames are detected as cross-domain" );
return false; return false;
...@@ -2377,7 +2377,8 @@ if ( jQuery.ajax && ( !isLocal || hasPHP ) ) { ...@@ -2377,7 +2377,8 @@ if ( jQuery.ajax && ( !isLocal || hasPHP ) ) {
var i = 1; var i = 1;
jQuery.ajax({ jQuery.ajax({
url: "http://somewebsitethatdoesnotexist-67864863574657654.com", // see RFC 2606
url: "http://example.invalid",
success: function() { success: function() {
ok( false, "success" ); ok( false, "success" );
}, },
...@@ -2398,7 +2399,7 @@ if ( jQuery.ajax && ( !isLocal || hasPHP ) ) { ...@@ -2398,7 +2399,7 @@ if ( jQuery.ajax && ( !isLocal || hasPHP ) ) {
var i = 1; var i = 1;
jQuery.ajax({ jQuery.ajax({
url: "http://www.google.com", url: "http://" + externalHost,
success: function() { success: function() {
ok( false, "success" ); ok( false, "success" );
}, },
......
...@@ -119,7 +119,7 @@ test( "attr(String)", function() { ...@@ -119,7 +119,7 @@ test( "attr(String)", function() {
equal( jQuery( option ).attr("selected"), "selected", "Make sure that a single option is selected, even when in an optgroup." ); equal( jQuery( option ).attr("selected"), "selected", "Make sure that a single option is selected, even when in an optgroup." );
var $img = jQuery("<img style='display:none' width='215' height='53' src='http://static.jquery.com/files/rocker/images/logo_jquery_215x53.gif'/>").appendTo("body"); var $img = jQuery("<img style='display:none' width='215' height='53' src='data/1x1.jpg'/>").appendTo("body");
equal( $img.attr("width"), "215", "Retrieve width attribute an an element with display:none." ); equal( $img.attr("width"), "215", "Retrieve width attribute an an element with display:none." );
equal( $img.attr("height"), "53", "Retrieve height attribute an an element with display:none." ); equal( $img.attr("height"), "53", "Retrieve height attribute an an element with display:none." );
......
...@@ -218,16 +218,16 @@ test("noConflict", function() { ...@@ -218,16 +218,16 @@ test("noConflict", function() {
var $$ = jQuery; var $$ = jQuery;
equal( jQuery, jQuery.noConflict(), "noConflict returned the jQuery object" ); strictEqual( jQuery, jQuery.noConflict(), "noConflict returned the jQuery object" );
equal( window["jQuery"], $$, "Make sure jQuery wasn't touched." ); strictEqual( window["jQuery"], $$, "Make sure jQuery wasn't touched." );
equal( window["$"], original$, "Make sure $ was reverted." ); strictEqual( window["$"], original$, "Make sure $ was reverted." );
jQuery = $ = $$; jQuery = $ = $$;
equal( jQuery.noConflict(true), $$, "noConflict returned the jQuery object" ); strictEqual( jQuery.noConflict(true), $$, "noConflict returned the jQuery object" );
equal( window["jQuery"], originaljQuery, "Make sure jQuery was reverted." ); strictEqual( window["jQuery"], originaljQuery, "Make sure jQuery was reverted." );
equal( window["$"], original$, "Make sure $ was reverted." ); strictEqual( window["$"], original$, "Make sure $ was reverted." );
ok( $$("#qunit-fixture").html("test"), "Make sure that jQuery still works." ); ok( $$().pushStack([]), "Make sure that jQuery still works." );
window["jQuery"] = jQuery = $$; window["jQuery"] = jQuery = $$;
}); });
......
...@@ -746,7 +746,7 @@ test("widows & orphans #8936", function () { ...@@ -746,7 +746,7 @@ test("widows & orphans #8936", function () {
test("can't get css for disconnected in IE<9, see #10254 and #8388", function() { test("can't get css for disconnected in IE<9, see #10254 and #8388", function() {
expect( 2 ); expect( 2 );
var span = jQuery( "<span/>" ).css( "background-image", "url(http://static.jquery.com/files/rocker/images/logo_jquery_215x53.gif)" ); var span = jQuery( "<span/>" ).css( "background-image", "url(data/1x1.jpg)" );
notEqual( span.css( "background-image" ), null, "can't get background-image in IE<9, see #10254" ); notEqual( span.css( "background-image" ), null, "can't get background-image in IE<9, see #10254" );
var div = jQuery( "<div/>" ).css( "top", 10 ); var div = jQuery( "<div/>" ).css( "top", 10 );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment