Tests: Minor updates for QUnit 1.16 compatibility

More to come later.

(cherry picked from commit f6f8848fbe477fa93fd27ac7f10885dd6e97f633)

diff --git a/test/data/testrunner.js b/test/data/testrunner.js
index c0d3fad7585a6200f72fdaf2f829063c5d57a4fb..682a454f2ccd4b5857e415ed038656908ca5750e 100644 (file)
--- a/test/data/testrunner.js
+++ b/test/data/testrunner.js
@@ -24,14 +24,13 @@ QUnit.config.requireExpects = true;
  * @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();

diff --git a/test/unit/attributes.js b/test/unit/attributes.js
index 0bfe5f073dbb394929c51ce3c4a621c38ff21980..69be6abe0646b662d6b59f8a77c7599001b18776 100644 (file)
--- a/test/unit/attributes.js
+++ b/test/unit/attributes.js
@@ -1266,7 +1266,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() {

diff --git a/test/unit/data.js b/test/unit/data.js
index 46a13adb9c99f68d07090a4e8af35ad34c15528d..d6d06e28b1c456a03c620834a1114d2bc67ce1c6 100644 (file)
--- a/test/unit/data.js
+++ b/test/unit/data.js
@@ -134,7 +134,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() {
@@ -152,7 +152,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("jQuery.data(<embed>)", 25, function() {

diff --git a/test/unit/dimensions.js b/test/unit/dimensions.js
index 7d37e13bc84c1f56484c61cb76bd754afc31c126..3f4e15b9ee64f0561ec0c0623efa1b5041e31874 100644 (file)
--- a/test/unit/dimensions.js
+++ b/test/unit/dimensions.js
@@ -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() {
@@ -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() {
@@ -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() {
@@ -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() {
@@ -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() {
@@ -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() {

diff --git a/test/unit/effects.js b/test/unit/effects.js
index 356344477d2c098cf17386f37f1993bc11d32fdb..99faa143872d4ba792ec9333bdcf7890f95648d5 100644 (file)
--- a/test/unit/effects.js
+++ b/test/unit/effects.js
@@ -45,7 +45,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 () {
@@ -92,7 +92,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>");
@@ -200,7 +200,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() {
@@ -1077,7 +1077,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"),
@@ -1094,7 +1095,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
@@ -1499,7 +1500,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: [],
@@ -1520,9 +1522,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([
@@ -1537,7 +1539,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 ) );