library-mirrors/jquery
1
0
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2025-01-10 18:24:24 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

No ticket: Fix subproject iframe tests

Browse Source 
(cherry picked from commit 13d58a9bec)
This commit is contained in:
Richard Gibson 2013-10-11 15:08:07 -04:00
parent 64bdf4140b
commit 3774ee49e0
3 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/.jshintrc
View File

@ -60,6 +60,7 @@
"originaljQuery": true, "originaljQuery": true,
"$": true, "$": true,
"original$": true, "original$": true,
"baseURL": true,
"externalHost": true "externalHost": true
} }
} }

15
test/data/testinit.js
View File

@ -1,6 +1,7 @@
/*jshint multistr:true, quotmark:false */ /*jshint multistr:true, quotmark:false */
var fireNative, originaljQuery, original$, var fireNative, originaljQuery, original$,
baseURL = "",
supportjQuery = this.jQuery, supportjQuery = this.jQuery,
// see RFC 2606 // see RFC 2606
externalHost = "example.com"; externalHost = "example.com";
@ -130,7 +131,8 @@ fireNative = document.createEvent ?
* @result "data/test.php?foo=bar&10538358345554" * @result "data/test.php?foo=bar&10538358345554"
*/ */
function url( value ) { function url( value ) {
return value + (/\?/.test(value) ? "&" : "?") + new Date().getTime() + "" + parseInt(Math.random() * 100000, 10); return baseURL + value + (/\?/.test(value) ? "&" : "?") +
new Date().getTime() + "" + parseInt(Math.random() * 100000, 10);
} }
// Ajax testing helper // Ajax testing helper
@ -236,6 +238,9 @@ this.testIframeWithCallback = function( title, fileName, func ) {
test( title, function() { test( title, function() {
var iframe; var iframe;
// Expect one assertion, but allow overrides
expect( 1 );
stop(); stop();
window.iframeCallback = function() { window.iframeCallback = function() {
var self = this, var self = this,
@ -248,12 +253,12 @@ this.testIframeWithCallback = function( title, fileName, func ) {
start(); start();
}, 0 ); }, 0 );
}; };
iframe = jQuery( "<div/>" ).append( iframe = jQuery( "<div/>" ).css({ position: "absolute", width: "500px", left: "-600px" })
jQuery( "<iframe/>" ).attr( "src", url( "./data/" + fileName ) ) .append( jQuery( "<iframe/>" ).attr( "src", url( "./data/" + fileName ) ) )
).appendTo( "body" ); .appendTo( "#qunit-fixture" );
}); });
}; };
this.iframeCallback = undefined; window.iframeCallback = undefined;
// Tests are always loaded async // Tests are always loaded async
QUnit.config.autostart = false; QUnit.config.autostart = false;

11
test/data/testrunner.js
View File

@ -238,7 +238,7 @@ window.Globals = (function() {
* @param {String} url Test folder location * @param {String} url Test folder location
* @param {RegExp} risTests To filter script sources * @param {RegExp} risTests To filter script sources
*/ */
function testSubproject( label, url, risTests, complete ) { function testSubproject( label, subProjectURL, risTests, complete ) {
var sub, fixture, fixtureHTML, var sub, fixture, fixtureHTML,
fixtureReplaced = false; fixtureReplaced = false;
@ -280,11 +280,11 @@ function testSubproject( label, url, risTests, complete ) {
// Load tests and fixture from subproject // Load tests and fixture from subproject
// Test order matters, so we must be synchronous and throw an error on load failure // Test order matters, so we must be synchronous and throw an error on load failure
supportjQuery.ajax( url, { supportjQuery.ajax( subProjectURL, {
async: false, async: false,
dataType: "html", dataType: "html",
error: function( jqXHR, status ) { error: function( jqXHR, status ) {
throw new Error( "Could not load: " + url + " (" + status + ")" ); throw new Error( "Could not load: " + subProjectURL + " (" + status + ")" );
}, },
success: function( data, status, jqXHR ) { success: function( data, status, jqXHR ) {
var sources = [], var sources = [],
@ -312,7 +312,7 @@ function testSubproject( label, url, risTests, complete ) {
(function loadDep() { (function loadDep() {
var dep = sources.shift(); var dep = sources.shift();
if ( dep ) { if ( dep ) {
require( [ url + dep ], loadDep ); require( [ subProjectURL + dep ], loadDep );
} else if ( complete ) { } else if ( complete ) {
complete(); complete();
} }
@ -338,6 +338,9 @@ function testSubproject( label, url, risTests, complete ) {
return; return;
} }
// Update helper function behavior
baseURL = subProjectURL;
// Replace the current fixture, including content outside of #qunit-fixture // Replace the current fixture, including content outside of #qunit-fixture
var oldFixture = supportjQuery("#qunit-fixture"); var oldFixture = supportjQuery("#qunit-fixture");
while ( oldFixture.length && !oldFixture.prevAll("[id='qunit']").length ) { while ( oldFixture.length && !oldFixture.prevAll("[id='qunit']").length ) {