From 9d0f44fd7b16a66de1d9b0d8c5e4ab954d83790f Mon Sep 17 00:00:00 2001 From: Jörn Zaefferer Date: Mon, 12 Jan 2015 17:19:46 +0100 Subject: All: Drop support for jQuery 1.6.x Affects core, effects, position and widget. Only position has unit tests that fail with jQuery 1.6 without the workaround. Drops the 1.6.x copies jQuery of jQuery and removes them from the select in the testsuites. Fixes #10723 Closes gh-1422 --- tests/unit/core/core.js | 11 ++--------- tests/unit/testsuite.js | 6 +++--- tests/unit/tooltip/tooltip_core.js | 5 +---- tests/unit/tooltip/tooltip_methods.js | 10 +++------- 4 files changed, 9 insertions(+), 23 deletions(-) (limited to 'tests') diff --git a/tests/unit/core/core.js b/tests/unit/core/core.js index 1b1dcbabf..2f3657605 100644 --- a/tests/unit/core/core.js +++ b/tests/unit/core/core.js @@ -127,18 +127,11 @@ test( "outerHeight(true) - setter", function() { test( "uniqueId / removeUniqueId", function() { expect( 3 ); var el = $( "img" ).eq( 0 ); - - // support: jQuery <1.6.2 - // support: IE <8 - // We should use strictEqual( id, undefined ) when dropping jQuery 1.6.1 support (or IE6/7) - ok( !el.attr( "id" ), "element has no initial id" ); + strictEqual( el.attr( "id" ), undefined, "element has no initial id" ); el.uniqueId(); ok( /ui-id-\d+$/.test( el.attr( "id" ) ), "element has generated id" ); el.removeUniqueId(); - // support: jQuery <1.6.2 - // support: IE <8 - // see above - ok( !el.attr( "id" ), "unique id has been removed from element" ); + strictEqual( el.attr( "id" ), undefined, "unique id has been removed from element" ); }); })( jQuery ); diff --git a/tests/unit/testsuite.js b/tests/unit/testsuite.js index 1c0f17859..186864114 100644 --- a/tests/unit/testsuite.js +++ b/tests/unit/testsuite.js @@ -64,9 +64,9 @@ QUnit.config.urlConfig.push({ id: "jquery", label: "jQuery version", value: [ - "1.6.0", "1.6.1", "1.6.2", "1.6.3", "1.6.4", "1.7.0", "1.7.1", "1.7.2", - "1.8.0", "1.8.1", "1.8.2", "1.8.3", "1.9.0", "1.9.1", "1.10.0", - "1.10.1", "1.10.2", "2.0.0", "2.0.1", "2.0.2", "2.0.3", "git" + "1.7.0", "1.7.1", "1.7.2", "1.8.0", "1.8.1", "1.8.2", "1.8.3", + "1.9.0", "1.9.1", "1.10.0", "1.10.1", "1.10.2", "2.0.0", + "2.0.1", "2.0.2", "2.0.3", "git" ], tooltip: "Which jQuery Core version to test against" }); diff --git a/tests/unit/tooltip/tooltip_core.js b/tests/unit/tooltip/tooltip_core.js index 2e029c7b0..4933be9ba 100644 --- a/tests/unit/tooltip/tooltip_core.js +++ b/tests/unit/tooltip/tooltip_core.js @@ -39,10 +39,7 @@ test( "accessibility", function() { "multiple describedby when open" ); // strictEqual to distinguish between .removeAttr( "title" ) and .attr( "title", "" ) - // support: jQuery <1.6.2 - // support: IE <8 - // We should use strictEqual( ..., undefined ) when dropping jQuery 1.6.1 support (or IE6/7) - ok( !element.attr( "title" ), "no title when open" ); + strictEqual( element.attr( "title" ), undefined, "no title when open" ); equal( liveRegion.children().length, 1 ); equal( liveRegion.children().last().html(), "..." ); element.tooltip( "close" ); diff --git a/tests/unit/tooltip/tooltip_methods.js b/tests/unit/tooltip/tooltip_methods.js index 8d1b1bd5b..e6641a14a 100644 --- a/tests/unit/tooltip/tooltip_methods.js +++ b/tests/unit/tooltip/tooltip_methods.js @@ -70,11 +70,7 @@ test( "enable/disable", function() { ok( !element.tooltip( "widget" ).hasClass( "ui-state-disabled" ), "element doesn't get ui-state-disabled" ); ok( !element.tooltip( "widget" ).attr( "aria-disabled" ), "element doesn't get aria-disabled" ); ok( !element.tooltip( "widget" ).hasClass( "ui-tooltip-disabled" ), "element doesn't get ui-tooltip-disabled" ); - - // support: jQuery <1.6.2 - // support: IE <8 - // We should use strictEqual( ..., undefined ) when dropping jQuery 1.6.1 support (or IE6/7) - ok( !tooltip.attr( "title" ), "title removed on disable" ); + strictEqual( tooltip.attr( "title" ), undefined, "title removed on disable" ); element.tooltip( "open" ); equal( $( ".ui-tooltip" ).length, 0, "open does nothing when disabled" ); @@ -123,7 +119,7 @@ test( "preserve changes to title attributes on close and destroy", function() { tests[ 5 ] = { expected: original, method: "destroy" }; $.each( tests, function( index, test ) { - + element.attr( "title", original ).tooltip() .tooltip( "open", $.Event( "mouseover", { target: element[ 0 ] } ) ); if ( test.title ) { @@ -133,7 +129,7 @@ test( "preserve changes to title attributes on close and destroy", function() { } element.tooltip( test.method ); equal( $( "#tooltipped1" ).attr( "title" ), test.expected ); - + } ); }); -- cgit v1.2.3