Skip to content

Commit

Permalink
Tests: Minor updates for QUnit 1.16 compatibility
Browse files Browse the repository at this point in the history 
More to come later.
  • Loading branch information
@gibson042
gibson042 committed Dec 5, 2014
1 parent b6e31a8 commit f6f8848
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 24 deletions.
7 changes: 3 additions & 4 deletions test/data/testrunner.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,13 @@ function keys( o ) {
* @param {jQuery|HTMLElement|Object|Array} elems Target (or array of targets) for jQuery.data.
* @param {string} key
*/
QUnit.expectJqData = function( elems, key ) {
var i, elem, expando,
currentEnv = "current_testEnvironment";
QUnit.expectJqData = function( env, elems, key ) {
var i, elem, expando;

// As of jQuery 2.0, there will be no "cache"-data is
// stored and managed completely below the API surface
if ( jQuery.cache ) {
QUnit[ currentEnv ].checkJqData = true;
env.checkJqData = true;

if ( elems.jquery && elems.toArray ) {
elems = elems.toArray();
Expand Down
2 changes: 1 addition & 1 deletion test/unit/attributes.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1269,7 +1269,7 @@ var testToggleClass = function(valueObj) {

// Cleanup
e.removeClass("testD");
QUnit.expectJqData( e[ 0 ], "__className__" );
QUnit.expectJqData( this, e[ 0 ], "__className__" );
};

test( "toggleClass(String|boolean|undefined[, boolean])", function() {
Expand Down
6 changes: 3 additions & 3 deletions test/unit/data.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ test("jQuery.data(div)", 25, function() {
// We stored one key in the private data
// assert that nothing else was put in there, and that that
// one stayed there.
QUnit.expectJqData( div, "foo" );
QUnit.expectJqData( this, div, "foo" );
});

test("jQuery.data({})", 25, function() {
Expand All @@ -96,7 +96,7 @@ test("jQuery.data(window)", 25, function() {
test("jQuery.data(document)", 25, function() {
dataTests( document );

QUnit.expectJqData( document, "foo" );
QUnit.expectJqData( this, document, "foo" );
});

test("Expando cleanup", 4, function() {
Expand Down Expand Up @@ -682,4 +682,4 @@ testIframeWithCallback( "enumerate data attrs on body (#14894)", "data/dataAttrs
expect(1);

equal(result, "ok", "enumeration of data- attrs on body" );
});
});
12 changes: 6 additions & 6 deletions test/unit/dimensions.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ function testWidth( val ) {

equal( jQuery(window).width(), document.documentElement.clientWidth, "Window width is equal to width reported by window/document." );

QUnit.expectJqData( $div[0], "olddisplay" );
QUnit.expectJqData( this, $div[0], "olddisplay" );
}

test("width()", function() {
Expand Down Expand Up @@ -110,7 +110,7 @@ function testHeight( val ) {

equal( jQuery(window).height(), document.documentElement.clientHeight, "Window width is equal to width reported by window/document." );

QUnit.expectJqData( $div[0], "olddisplay" );
QUnit.expectJqData( this, $div[0], "olddisplay" );
}

test("height()", function() {
Expand Down Expand Up @@ -166,7 +166,7 @@ test("innerWidth()", function() {
equal( div.innerWidth(), 0, "Make sure that disconnected nodes are handled." );

div.remove();
QUnit.expectJqData( $div[0], "olddisplay" );
QUnit.expectJqData( this, $div[0], "olddisplay" );
});

test("innerHeight()", function() {
Expand Down Expand Up @@ -202,7 +202,7 @@ test("innerHeight()", function() {
equal( div.innerHeight(), 0, "Make sure that disconnected nodes are handled." );

div.remove();
QUnit.expectJqData( $div[0], "olddisplay" );
QUnit.expectJqData( this, $div[0], "olddisplay" );
});

test("outerWidth()", function() {
Expand Down Expand Up @@ -241,7 +241,7 @@ test("outerWidth()", function() {
equal( div.outerWidth(), 0, "Make sure that disconnected nodes are handled." );

div.remove();
QUnit.expectJqData( $div[0], "olddisplay" );
QUnit.expectJqData( this, $div[0], "olddisplay" );
});

test("child of a hidden elem (or unconnected node) has accurate inner/outer/Width()/Height() see #9441 #9300", function() {
Expand Down Expand Up @@ -388,7 +388,7 @@ test("outerHeight()", function() {
equal( div.outerHeight(), 0, "Make sure that disconnected nodes are handled." );

div.remove();
QUnit.expectJqData( $div[0], "olddisplay" );
QUnit.expectJqData( this, $div[0], "olddisplay" );
});

test("passing undefined is a setter #5571", function() {
Expand Down
22 changes: 12 additions & 10 deletions test/unit/effects.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ test("show() basic", 2, function() {
// Clean up the detached node
div.remove();

QUnit.expectJqData(hiddendiv, "olddisplay");
QUnit.expectJqData( this, hiddendiv, "olddisplay" );
});

test("show()", 27, function () {
Expand Down Expand Up @@ -94,7 +94,7 @@ test("show()", 27, function () {
});

// Tolerate data from show()/hide()
QUnit.expectJqData(div, "olddisplay");
QUnit.expectJqData( this, div, "olddisplay" );

// #show-tests * is set display: none in CSS
jQuery("#qunit-fixture").append("<div id='show-tests'><div><p><a href='#'></a></p><code></code><pre></pre><span></span></div><table><thead><tr><th></th></tr></thead><tbody><tr><td></td></tr></tbody></table><ul><li></li></ul></div><table id='test-table'></table>");
Expand Down Expand Up @@ -203,7 +203,7 @@ test("Persist correct display value", function() {

clock.tick( 300 );

QUnit.expectJqData($span, "olddisplay");
QUnit.expectJqData( this, $span, "olddisplay" );
});

test("animate(Hash, Object, Function)", function() {
Expand Down Expand Up @@ -1127,7 +1127,8 @@ test("jQuery.show('fast') doesn't clear radio buttons (bug #1095)", function ()
test( "interrupt toggle", function() {
expect( 24 );

var longDuration = 2000,
var env = this,
longDuration = 2000,
shortDuration = 500,
remaining = 0,
$elems = jQuery(".chain-test"),
Expand All @@ -1144,7 +1145,7 @@ test( "interrupt toggle", function() {
jQuery.data( this, "startVal", jQuery( this ).css( prop ) );

// Expect olddisplay data from our .hide() call below
QUnit.expectJqData( this, "olddisplay" );
QUnit.expectJqData( env, this, "olddisplay" );
});

// Interrupt a hiding toggle
Expand Down Expand Up @@ -1551,7 +1552,8 @@ test( "User supplied callback called after show when fx off (#8892)", 2, functio
test( "animate should set display for disconnected nodes", function() {
expect( 18 );

var methods = {
var env = this,
methods = {
toggle: [ 1 ],
slideToggle: [],
fadeIn: [],
Expand All @@ -1572,9 +1574,9 @@ test( "animate should set display for disconnected nodes", function() {
strictEqual( $divNone.show()[ 0 ].style.display, "block", "show() should change display if it already set to none" );
strictEqual( $divInline.show()[ 0 ].style.display, "inline", "show() should not change display if it already set" );

QUnit.expectJqData( $divTest[ 0 ], "olddisplay" );
QUnit.expectJqData( $divEmpty[ 0 ], "olddisplay" );
QUnit.expectJqData( $divNone[ 0 ], "olddisplay" );
QUnit.expectJqData( env, $divTest[ 0 ], "olddisplay" );
QUnit.expectJqData( env, $divEmpty[ 0 ], "olddisplay" );
QUnit.expectJqData( env, $divNone[ 0 ], "olddisplay" );

jQuery.each( methods, function( name, opt ) {
jQuery.each([
Expand All @@ -1589,7 +1591,7 @@ test( "animate should set display for disconnected nodes", function() {
var callback = [function () {
strictEqual( this.style.display, "block", "set display to block with " + name );

QUnit.expectJqData( this, "olddisplay" );
QUnit.expectJqData( env, this, "olddisplay" );

}];
jQuery.fn[ name ].apply( this, opt.concat( callback ) );
Expand Down

0 comments on commit f6f8848

Please sign in to comment.