Skip to content
Permalink
Browse files

No ticket: remove test suite external dependencies

  • Loading branch information
gibson042 committed Nov 1, 2012
1 parent 395f1da commit 3f515045808dda2b4320a82894e875eb61d255e2
@@ -54,6 +54,7 @@
"isLocal": true,
"originaljQuery": true,
"$": true,
"original$": true
"original$": true,
"externalHost": true,

This comment has been minimized.

Copy link
@dmethvin

dmethvin Nov 1, 2012

Member

Dunno if it's the trailing comma, but jshint is throwing a fit about the unit tests now.

This comment has been minimized.

Copy link
@Krinkle

Krinkle Nov 1, 2012

Member

Yep, where in JS it is sometimes tolerated, in JSON it is always invalid. Depending on the jshint implementation it will ignore the entire file and consider it invalid JSON because the parser used is unable parse the JSON.

This comment has been minimized.

Copy link
@gibson042

gibson042 Nov 2, 2012

Author Member

Color me ashamed. Fix forthcoming (if not already in).

}
}
@@ -10,7 +10,7 @@
<script>
var script = document.getElementsByTagName( "script" )[ 0 ],
div = document.createElement( "div" ),
src = "http://google.com",
src = "http://" + window.parent.externalHost,
success = true,
error = "";
@@ -31,6 +31,6 @@
( error ? ": " + error : "" )
});
});
</script>
</script>
</body>
</html>
@@ -4,7 +4,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<style>
body {
background: url('http://s1.postimage.org/2d2r8xih0/body_background.png');
background: url('../1x1.jpg');
}
</style>
<script src="../../../dist/jquery.js"></script>
@@ -1,12 +1,12 @@
/*jshint multistr:true */

var originaljQuery = this.jQuery || "jQuery",
var amdDefined, fireNative,
originaljQuery = this.jQuery || "jQuery",
original$ = this.$ || "$",
hasPHP = true,
// Disable Ajax tests to reduce network strain
// Re-enabled (at least the variable should be declared)
isLocal = window.location.protocol === "file:",
amdDefined;
// see RFC 2606
externalHost = "example.com";

// For testing .noConflict()
this.jQuery = originaljQuery;
@@ -58,7 +58,7 @@ function t( a, b, c ) {
deepEqual(f, q.apply( q, c ), a + " (" + b + ")");
}

var createDashboardXML = function() {
function createDashboardXML() {
var string = '<?xml version="1.0" encoding="UTF-8"?> \
<dashboard> \
<locations class="foo"> \
@@ -74,17 +74,17 @@ var createDashboardXML = function() {
return jQuery.parseXML(string);
};

This comment has been minimized.

Copy link
@Krinkle

Krinkle Nov 1, 2012

Member

Trailing comma!

This comment has been minimized.

Copy link
@mikesherov

mikesherov Nov 2, 2012

Member

unnecessary semi.


var createWithFriesXML = function() {
function createWithFriesXML() {
var string = '<?xml version="1.0" encoding="UTF-8"?> \
<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" \
xmlns:xsd="http://www.w3.org/2001/XMLSchema" \
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> \
<soap:Body> \
<jsconf xmlns="http://www.example.com/ns1"> \
<response xmlns:ab="http://www.example.com/ns2"> \
<jsconf xmlns="http://{{ externalHost }}/ns1"> \
<response xmlns:ab="http://{{ externalHost }}/ns2"> \
<meta> \
<component id="seite1" class="component"> \
<properties xmlns:cd="http://www.example.com/ns3"> \
<properties xmlns:cd="http://{{ externalHost }}/ns3"> \
<property name="prop1"> \
<thing /> \
<value>1</value> \
@@ -101,10 +101,10 @@ var createWithFriesXML = function() {
</soap:Body> \
</soap:Envelope>';

return jQuery.parseXML(string);
return jQuery.parseXML( string.replace( /\{\{\s*externalHost\s*\}\}/g, externalHost ) );
};

This comment has been minimized.

Copy link
@Krinkle

Krinkle Nov 1, 2012

Member

Trailing comma!

This comment has been minimized.

Copy link
@mikesherov

mikesherov Nov 2, 2012

Member

unnecessary semi.

This comment has been minimized.

Copy link
@Krinkle

Krinkle Nov 2, 2012

Member

Lol, yes of course, that's what I meant 😮


var createXMLFragment = function() {
function createXMLFragment() {
var xml, frag;
if ( window.ActiveXObject ) {
xml = new ActiveXObject("msxml2.domdocument");
@@ -119,19 +119,16 @@ var createXMLFragment = function() {
return frag;
};

This comment has been minimized.

Copy link
@Krinkle

Krinkle Nov 1, 2012

Member

Trailing comma!

This comment has been minimized.

Copy link
@mikesherov

mikesherov Nov 2, 2012

Member

unnecessary semi.


var fireNative;
if ( document.createEvent ) {
fireNative = function( node, type ) {
fireNative = document.createEvent ?
function( node, type ) {
var event = document.createEvent('HTMLEvents');
event.initEvent( type, true, true );
node.dispatchEvent( event );
};
} else {
fireNative = function( node, type ) {
} :
function( node, type ) {
var event = document.createEventObject();
node.fireEvent( 'on' + type, event );
};
}

/**
* Add random number to url to stop caching
@@ -201,6 +198,8 @@ function url( value ) {
).appendTo( "body" );
});
};

window.iframeCallback = undefined;
}());

// Sandbox start for great justice
@@ -3,11 +3,11 @@
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<soap:Body>
<jsconf xmlns="http://www.example.com/ns1">
<response xmlns:ab="http://www.example.com/ns2">
<jsconf xmlns="http://example.com/ns1">
<response xmlns:ab="http://example.com/ns2">
<meta>
<component id="seite1" class="component">
<properties xmlns:cd="http://www.example.com/ns3">
<properties xmlns:cd="http://example.com/ns3">
<property name="prop1">
<thing />
<value>1</value>
@@ -621,7 +621,7 @@ if ( jQuery.ajax && ( !isLocal || hasPHP ) ) {

jQuery.ajax({
dataType: "jsonp",
url: loc.protocol + "//somewebsitethatdoesnotexist-656329477541.com:" + ( loc.port || 80 ),
url: loc.protocol + "//example.invalid:" + ( loc.port || 80 ),
beforeSend: function( _, s ) {
ok( s.crossDomain, "Test different hostnames are detected as cross-domain" );
return false;
@@ -2377,7 +2377,8 @@ if ( jQuery.ajax && ( !isLocal || hasPHP ) ) {
var i = 1;

jQuery.ajax({
url: "http://somewebsitethatdoesnotexist-67864863574657654.com",
// see RFC 2606
url: "http://example.invalid",
success: function() {
ok( false, "success" );
},
@@ -2398,7 +2399,7 @@ if ( jQuery.ajax && ( !isLocal || hasPHP ) ) {
var i = 1;

jQuery.ajax({
url: "http://www.google.com",
url: "http://" + externalHost,
success: function() {
ok( false, "success" );
},
@@ -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." );

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("height"), "53", "Retrieve height attribute an an element with display:none." );

@@ -218,16 +218,16 @@ test("noConflict", function() {

var $$ = jQuery;

equal( jQuery, jQuery.noConflict(), "noConflict returned the jQuery object" );
equal( window["jQuery"], $$, "Make sure jQuery wasn't touched." );
equal( window["$"], original$, "Make sure $ was reverted." );
strictEqual( jQuery, jQuery.noConflict(), "noConflict returned the jQuery object" );
strictEqual( window["jQuery"], $$, "Make sure jQuery wasn't touched." );
strictEqual( window["$"], original$, "Make sure $ was reverted." );

jQuery = $ = $$;

equal( jQuery.noConflict(true), $$, "noConflict returned the jQuery object" );
equal( window["jQuery"], originaljQuery, "Make sure jQuery was reverted." );
equal( window["$"], original$, "Make sure $ was reverted." );
ok( $$("#qunit-fixture").html("test"), "Make sure that jQuery still works." );
strictEqual( jQuery.noConflict(true), $$, "noConflict returned the jQuery object" );
strictEqual( window["jQuery"], originaljQuery, "Make sure jQuery was reverted." );
strictEqual( window["$"], original$, "Make sure $ was reverted." );
ok( $$().pushStack([]), "Make sure that jQuery still works." );

window["jQuery"] = jQuery = $$;
});
@@ -746,7 +746,7 @@ test("widows & orphans #8936", function () {

test("can't get css for disconnected in IE<9, see #10254 and #8388", function() {
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" );

var div = jQuery( "<div/>" ).css( "top", 10 );

0 comments on commit 3f51504

Please sign in to comment.
You can’t perform that action at this time.