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

Tests: Partially use new qunit interface

Browse Source 
http://qunitjs.com/upgrade-guide-2.x/

For most of the boring work was used
https://github.com/apsdehal/qunit-migrate package

However, it can't update local qunit helpers, plus in some places
old QUnit.asyncTest signature is still used

Ref b930d14ce6
Fixes gh-2540
This commit is contained in:
Oleg Gaidarenko
2015-09-03 04:46:31 +03:00
parent c530661629
commit 4543815eed
24 changed files with 6640 additions and 6116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
test/data/testinit.js
View File

@@ -17,7 +17,7 @@ original$ = this.$ = "replaced";
/**
* Returns an array of elements with the given IDs
* @example q("main", "foo", "bar")
* @example q( "main", "foo", "bar" )
* @result [<div id="main">, <span id="foo">, <input id="bar">]
*/
this.q = function() {
@@ -114,12 +114,12 @@ this.createXMLFragment = function() {
fireNative = document.createEvent ?
function( node, type ) {
var event = document.createEvent( "HTMLEvents" );
event.initEvent( type, true, true );
node.dispatchEvent( event );
} :
function( node, type ) {
var event = document.createEventObject();
node.fireEvent( "on" + type, event );
node.fireEvent( "on" + type, document.createEventObject() );
};
/**
@@ -138,16 +138,20 @@ function url( value ) {
// Ajax testing helper
this.ajaxTest = function( title, expect, options ) {
var requestOptions;
if ( jQuery.isFunction( options ) ) {
options = options();
}
options = options || [];
requestOptions = options.requests || options.request || options;
if ( !jQuery.isArray( requestOptions ) ) {
requestOptions = [ requestOptions ];
}
asyncTest( title, expect, function() {
QUnit.test( title, expect, function( assert ) {
var requestOptions;
if ( jQuery.isFunction( options ) ) {
options = options( assert );
}
options = options || [];
requestOptions = options.requests || options.request || options;
if ( !jQuery.isArray( requestOptions ) ) {
requestOptions = [ requestOptions ];
}
var done = assert.async();
if ( options.setup ) {
options.setup();
}
@@ -161,7 +165,9 @@ this.ajaxTest = function( title, expect, options ) {
if ( options.teardown ) {
options.teardown();
}
start();
// Make sure all events will be called before done()
setTimeout( done );
}
},
requests = jQuery.map( requestOptions, function( options ) {
@@ -171,7 +177,7 @@ this.ajaxTest = function( title, expect, options ) {
return function( _, status ) {
if ( !completed ) {
if ( !handler ) {
ok( false, "unexpected " + status );
assert.ok( false, "unexpected " + status );
} else if ( jQuery.isFunction( handler ) ) {
handler.apply( this, arguments );
}
@@ -180,7 +186,7 @@ this.ajaxTest = function( title, expect, options ) {
};
if ( options.afterSend ) {
options.afterSend( request );
options.afterSend( request, assert );
}
return request
@@ -203,7 +209,8 @@ this.ajaxTest = function( title, expect, options ) {
};
this.testIframe = function( fileName, name, fn ) {
asyncTest( name, function() {
QUnit.test( name, function( assert ) {
var done = assert.async();
// load fixture in iframe
var iframe = loadFixture(),
@@ -212,10 +219,9 @@ this.testIframe = function( fileName, name, fn ) {
if ( win && win.jQuery && win.jQuery.isReady ) {
clearInterval( interval );
start();
// call actual tests passing the correct jQuery instance to use
fn.call( this, win.jQuery, win, win.document );
fn.call( this, win.jQuery, win, win.document, assert );
done();
document.body.removeChild( iframe );
iframe = null;
}
@@ -234,31 +240,31 @@ this.testIframe = function( fileName, name, fn ) {
};
this.testIframeWithCallback = function( title, fileName, func ) {
test( title, function() {
QUnit.test( title, 1, function( assert ) {
var iframe;
var done = assert.async();
// Expect one assertion, but allow overrides
expect( 1 );
stop();
window.iframeCallback = function() {
var self = this,
args = arguments;
var args = Array.prototype.slice.call( arguments );
args.push( assert );
setTimeout( function() {
window.iframeCallback = undefined;
this.iframeCallback = undefined;
iframe.remove();
func.apply( self, args );
func.apply( this, args );
func = function() {};
start();
}, 0 );
done();
} );
};
iframe = jQuery( "<div/>" ).css( { position: "absolute", width: "500px", left: "-600px" } )
.append( jQuery( "<iframe/>" ).attr( "src", url( "./data/" + fileName ) ) )
.appendTo( "#qunit-fixture" );
} );
};
window.iframeCallback = undefined;
this.iframeCallback = undefined;
// Tests are always loaded async
QUnit.config.autostart = false;