github/jquery
1
1
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2026-04-20 03:01:22 -04:00
Code Issues 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
Download Patch File Download Diff File Expand all files Collapse all files

15
test/data/testinit.js
View File

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