Accordion tests: Don't use deprecated assertion methods.

diff --git a/tests/unit/accordion/accordion.html b/tests/unit/accordion/accordion.html
index c260ef22f9c81b6cf29f20d428c98767718d3da6..ef20c057ed5e34555ca8b81908b8e8681702c95d 100644 (file)
--- a/tests/unit/accordion/accordion.html
+++ b/tests/unit/accordion/accordion.html
@@ -25,7 +25,7 @@
                var actual = accordion.find( ".ui-accordion-content" ).map(function() {
                        return $( this ).css( "display" ) === "none" ? 0 : 1;
                }).get();
-               same( actual, expected );
+               deepEqual( actual, expected );
        }
        function equalHeights( accordion, min, max ) {
                var sizes = [];
@@ -34,8 +34,8 @@
                });
                ok( sizes[ 0 ] >= min && sizes[ 0 ] <= max,
                        "must be within " + min + " and " + max + ", was " + sizes[ 0 ] );
-               same( sizes[ 0 ], sizes[ 1 ] );
-               same( sizes[ 0 ], sizes[ 2 ] );
+               deepEqual( sizes[ 0 ], sizes[ 1 ] );
+               deepEqual( sizes[ 0 ], sizes[ 2 ] );
        }
        function accordionSetupTeardown() {
                var animated = $.ui.accordion.prototype.options.animated;

diff --git a/tests/unit/accordion/accordion_core.js b/tests/unit/accordion/accordion_core.js
index 280339c2666951a7dc07a21adf13940ab065e147..000470d0b8f70aa632048761e70a1404a26f695d 100644 (file)
--- a/tests/unit/accordion/accordion_core.js
+++ b/tests/unit/accordion/accordion_core.js
@@ -10,7 +10,7 @@ $.each( { div: "#list1", ul: "#navigation", dl: "#accordion-dl" }, function( typ
                        ".ui-accordion-header elements exist, correct number" );
                equal( element.find( ".ui-accordion-content" ).length, 3,
                        ".ui-accordion-content elements exist, correct number" );
-               same( element.find( ".ui-accordion-header" ).next().get(),
+               deepEqual( element.find( ".ui-accordion-header" ).next().get(),
                        element.find( ".ui-accordion-content" ).get(),
                        "content panels come immediately after headers" );
        });
@@ -26,7 +26,7 @@ test( "ui-accordion-heading class added to headers anchor", function() {
        expect( 1 );
        var element = $( "#list1" ).accordion();
        var anchors = element.find( ".ui-accordion-heading" );
-       equals( anchors.length, 3 );
+       equal( anchors.length, 3 );
 });
 
 test( "accessibility", function () {
@@ -34,20 +34,20 @@ test( "accessibility", function () {
        var element = $( "#list1" ).accordion().accordion( "option", "active", 1 );
        var headers = element.find( ".ui-accordion-header" );
 
-       equals( headers.eq( 1 ).attr( "tabindex" ), 0, "active header should have tabindex=0" );
-       equals( headers.eq( 0 ).attr( "tabindex" ), -1, "inactive header should have tabindex=-1" );
-       equals( element.attr( "role" ), "tablist", "main role" );
-       equals( headers.attr( "role" ), "tab", "tab roles" );
-       equals( headers.next().attr( "role" ), "tabpanel", "tabpanel roles" );
-       equals( headers.eq( 1 ).attr( "aria-expanded" ), "true", "active tab has aria-expanded" );
-       equals( headers.eq( 0 ).attr( "aria-expanded" ), "false", "inactive tab has aria-expanded" );
-       equals( headers.eq( 1 ).attr( "aria-selected" ), "true", "active tab has aria-selected" );
-       equals( headers.eq( 0 ).attr( "aria-selected" ), "false", "inactive tab has aria-selected" );
+       equal( headers.eq( 1 ).attr( "tabindex" ), 0, "active header should have tabindex=0" );
+       equal( headers.eq( 0 ).attr( "tabindex" ), -1, "inactive header should have tabindex=-1" );
+       equal( element.attr( "role" ), "tablist", "main role" );
+       equal( headers.attr( "role" ), "tab", "tab roles" );
+       equal( headers.next().attr( "role" ), "tabpanel", "tabpanel roles" );
+       equal( headers.eq( 1 ).attr( "aria-expanded" ), "true", "active tab has aria-expanded" );
+       equal( headers.eq( 0 ).attr( "aria-expanded" ), "false", "inactive tab has aria-expanded" );
+       equal( headers.eq( 1 ).attr( "aria-selected" ), "true", "active tab has aria-selected" );
+       equal( headers.eq( 0 ).attr( "aria-selected" ), "false", "inactive tab has aria-selected" );
        element.accordion( "option", "active", 0 );
-       equals( headers.eq( 0 ).attr( "aria-expanded" ), "true", "newly active tab has aria-expanded" );
-       equals( headers.eq( 1 ).attr( "aria-expanded" ), "false", "newly inactive tab has aria-expanded" );
-       equals( headers.eq( 0 ).attr( "aria-selected" ), "true", "active tab has aria-selected" );
-       equals( headers.eq( 1 ).attr( "aria-selected" ), "false", "inactive tab has aria-selected" );
+       equal( headers.eq( 0 ).attr( "aria-expanded" ), "true", "newly active tab has aria-expanded" );
+       equal( headers.eq( 1 ).attr( "aria-expanded" ), "false", "newly inactive tab has aria-expanded" );
+       equal( headers.eq( 0 ).attr( "aria-selected" ), "true", "active tab has aria-selected" );
+       equal( headers.eq( 1 ).attr( "aria-selected" ), "false", "inactive tab has aria-selected" );
 });
 
 }( jQuery ) );

diff --git a/tests/unit/accordion/accordion_deprecated.html b/tests/unit/accordion/accordion_deprecated.html
index e8254f4f3ec572d5926d584be846484b9d856aae..2e754fe6af5bdb1c1b7b9f2a4037b1f16b45bf73 100644 (file)
--- a/tests/unit/accordion/accordion_deprecated.html
+++ b/tests/unit/accordion/accordion_deprecated.html
@@ -22,7 +22,7 @@
                var actual = accordion.find( ".ui-accordion-content" ).map(function() {
                        return $( this ).css( "display" ) === "none" ? 0 : 1;
                }).get();
-               same( actual, expected );
+               deepEqual( actual, expected );
        }
        function equalHeights( accordion, min, max ) {
                var sizes = [];
@@ -31,8 +31,8 @@
                });
                ok( sizes[ 0 ] >= min && sizes[ 0 ] <= max,
                        "must be within " + min + " and " + max + ", was " + sizes[ 0 ] );
-               same( sizes[ 0 ], sizes[ 1 ] );
-               same( sizes[ 0 ], sizes[ 2 ] );
+               deepEqual( sizes[ 0 ], sizes[ 1 ] );
+               deepEqual( sizes[ 0 ], sizes[ 2 ] );
        }
        function accordionSetupTeardown() {
                var animated = $.ui.accordion.prototype.options.animated;

diff --git a/tests/unit/accordion/accordion_deprecated.js b/tests/unit/accordion/accordion_deprecated.js
index 0435f48a7c03c4f4e2ffb7ed6120dced1365f69e..733cb82b0f52faf70c44eb31099b3b99a6b23cb3 100644 (file)
--- a/tests/unit/accordion/accordion_deprecated.js
+++ b/tests/unit/accordion/accordion_deprecated.js
@@ -237,11 +237,11 @@ test( "changestart", function() {
        var content = element.find( ".ui-accordion-content" );
 
        element.one( "accordionchangestart", function( event, ui ) {
-               equals( ui.oldHeader.size(), 0 );
-               equals( ui.oldContent.size(), 0 );
-               equals( ui.newHeader.size(), 1 );
+               equal( ui.oldHeader.size(), 0 );
+               equal( ui.oldContent.size(), 0 );
+               equal( ui.newHeader.size(), 1 );
                strictEqual( ui.newHeader[ 0 ], headers[ 0 ] );
-               equals( ui.newContent.size(), 1 );
+               equal( ui.newContent.size(), 1 );
                strictEqual( ui.newContent[ 0 ], content[ 0 ] );
                accordion_state( element, 0, 0, 0 );
        });
@@ -249,13 +249,13 @@ test( "changestart", function() {
        accordion_state( element, 1, 0, 0 );
 
        element.one( "accordionchangestart", function( event, ui ) {
-               equals( ui.oldHeader.size(), 1 );
+               equal( ui.oldHeader.size(), 1 );
                strictEqual( ui.oldHeader[ 0 ], headers[ 0 ] );
-               equals( ui.oldContent.size(), 1 );
+               equal( ui.oldContent.size(), 1 );
                strictEqual( ui.oldContent[ 0 ], content[ 0 ] );
-               equals( ui.newHeader.size(), 1 );
+               equal( ui.newHeader.size(), 1 );
                strictEqual( ui.newHeader[ 0 ], headers[ 1 ] );
-               equals( ui.newContent.size(), 1 );
+               equal( ui.newContent.size(), 1 );
                strictEqual( ui.newContent[ 0 ], content[ 1 ] );
                accordion_state( element, 1, 0, 0 );
        });
@@ -263,12 +263,12 @@ test( "changestart", function() {
        accordion_state( element, 0, 1, 0 );
 
        element.one( "accordionchangestart", function( event, ui ) {
-               equals( ui.oldHeader.size(), 1 );
+               equal( ui.oldHeader.size(), 1 );
                strictEqual( ui.oldHeader[ 0 ], headers[ 1 ] );
-               equals( ui.oldContent.size(), 1 );
+               equal( ui.oldContent.size(), 1 );
                strictEqual( ui.oldContent[ 0 ], content[ 1 ] );
-               equals( ui.newHeader.size(), 0 );
-               equals( ui.newContent.size(), 0 );
+               equal( ui.newHeader.size(), 0 );
+               equal( ui.newContent.size(), 0 );
                accordion_state( element, 0, 1, 0 );
        });
        element.accordion( "option", "active", false );
@@ -285,34 +285,34 @@ test( "change", function() {
        var content = element.find( ".ui-accordion-content" );
 
        element.one( "accordionchange", function( event, ui ) {
-               equals( ui.oldHeader.size(), 0 );
-               equals( ui.oldContent.size(), 0 );
-               equals( ui.newHeader.size(), 1 );
+               equal( ui.oldHeader.size(), 0 );
+               equal( ui.oldContent.size(), 0 );
+               equal( ui.newHeader.size(), 1 );
                strictEqual( ui.newHeader[ 0 ], headers[ 0 ] );
-               equals( ui.newContent.size(), 1 );
+               equal( ui.newContent.size(), 1 );
                strictEqual( ui.newContent[ 0 ], content[ 0 ] );
        });
        element.accordion( "option", "active", 0 );
 
        element.one( "accordionchange", function( event, ui ) {
-               equals( ui.oldHeader.size(), 1 );
+               equal( ui.oldHeader.size(), 1 );
                strictEqual( ui.oldHeader[ 0 ], headers[ 0 ] );
-               equals( ui.oldContent.size(), 1 );
+               equal( ui.oldContent.size(), 1 );
                strictEqual( ui.oldContent[ 0 ], content[ 0 ] );
-               equals( ui.newHeader.size(), 1 );
+               equal( ui.newHeader.size(), 1 );
                strictEqual( ui.newHeader[ 0 ], headers[ 1 ] );
-               equals( ui.newContent.size(), 1 );
+               equal( ui.newContent.size(), 1 );
                strictEqual( ui.newContent[ 0 ], content[ 1 ] );
        });
        headers.eq( 1 ).click();
 
        element.one( "accordionchange", function( event, ui ) {
-               equals( ui.oldHeader.size(), 1 );
+               equal( ui.oldHeader.size(), 1 );
                strictEqual( ui.oldHeader[ 0 ], headers[ 1 ] );
-               equals( ui.oldContent.size(), 1 );
+               equal( ui.oldContent.size(), 1 );
                strictEqual( ui.oldContent[ 0 ], content[ 1 ] );
-               equals( ui.newHeader.size(), 0 );
-               equals( ui.newContent.size(), 0 );
+               equal( ui.newHeader.size(), 0 );
+               equal( ui.newContent.size(), 0 );
        });
        element.accordion( "option", "active", false );
 });

diff --git a/tests/unit/accordion/accordion_events.js b/tests/unit/accordion/accordion_events.js
index 2438f28eade287c4b966bcf188fba9140d62aaf0..d704e54c822c2ba977054a3970072de0dbf2b4cd 100644 (file)
--- a/tests/unit/accordion/accordion_events.js
+++ b/tests/unit/accordion/accordion_events.js
@@ -13,11 +13,11 @@ test( "beforeActivate", function() {
 
        element.one( "accordionbeforeactivate", function( event, ui ) {
                ok( !( "originalEvent" in event ) );
-               equals( ui.oldHeader.size(), 0 );
-               equals( ui.oldContent.size(), 0 );
-               equals( ui.newHeader.size(), 1 );
+               equal( ui.oldHeader.size(), 0 );
+               equal( ui.oldContent.size(), 0 );
+               equal( ui.newHeader.size(), 1 );
                strictEqual( ui.newHeader[ 0 ], headers[ 0 ] );
-               equals( ui.newContent.size(), 1 );
+               equal( ui.newContent.size(), 1 );
                strictEqual( ui.newContent[ 0 ], content[ 0 ] );
                accordion_state( element, 0, 0, 0 );
        });
@@ -25,14 +25,14 @@ test( "beforeActivate", function() {
        accordion_state( element, 1, 0, 0 );
 
        element.one( "accordionbeforeactivate", function( event, ui ) {
-               equals( event.originalEvent.type, "click" );
-               equals( ui.oldHeader.size(), 1 );
+               equal( event.originalEvent.type, "click" );
+               equal( ui.oldHeader.size(), 1 );
                strictEqual( ui.oldHeader[ 0 ], headers[ 0 ] );
-               equals( ui.oldContent.size(), 1 );
+               equal( ui.oldContent.size(), 1 );
                strictEqual( ui.oldContent[ 0 ], content[ 0 ] );
-               equals( ui.newHeader.size(), 1 );
+               equal( ui.newHeader.size(), 1 );
                strictEqual( ui.newHeader[ 0 ], headers[ 1 ] );
-               equals( ui.newContent.size(), 1 );
+               equal( ui.newContent.size(), 1 );
                strictEqual( ui.newContent[ 0 ], content[ 1 ] );
                accordion_state( element, 1, 0, 0 );
        });
@@ -41,12 +41,12 @@ test( "beforeActivate", function() {
 
        element.one( "accordionbeforeactivate", function( event, ui ) {
                ok( !( "originalEvent" in event ) );
-               equals( ui.oldHeader.size(), 1 );
+               equal( ui.oldHeader.size(), 1 );
                strictEqual( ui.oldHeader[ 0 ], headers[ 1 ] );
-               equals( ui.oldContent.size(), 1 );
+               equal( ui.oldContent.size(), 1 );
                strictEqual( ui.oldContent[ 0 ], content[ 1 ] );
-               equals( ui.newHeader.size(), 0 );
-               equals( ui.newContent.size(), 0 );
+               equal( ui.newHeader.size(), 0 );
+               equal( ui.newContent.size(), 0 );
                accordion_state( element, 0, 1, 0 );
        });
        element.accordion( "option", "active", false );
@@ -54,11 +54,11 @@ test( "beforeActivate", function() {
 
        element.one( "accordionbeforeactivate", function( event, ui ) {
                ok( !( "originalEvent" in event ) );
-               equals( ui.oldHeader.size(), 0 );
-               equals( ui.oldContent.size(), 0 );
-               equals( ui.newHeader.size(), 1 );
+               equal( ui.oldHeader.size(), 0 );
+               equal( ui.oldContent.size(), 0 );
+               equal( ui.newHeader.size(), 1 );
                strictEqual( ui.newHeader[ 0 ], headers[ 2 ] );
-               equals( ui.newContent.size(), 1 );
+               equal( ui.newContent.size(), 1 );
                strictEqual( ui.newContent[ 0 ], content[ 2 ] );
                event.preventDefault();
                accordion_state( element, 0, 0, 0 );
@@ -77,34 +77,34 @@ test( "activate", function() {
        var content = element.find( ".ui-accordion-content" );
 
        element.one( "accordionactivate", function( event, ui ) {
-               equals( ui.oldHeader.size(), 0 );
-               equals( ui.oldContent.size(), 0 );
-               equals( ui.newHeader.size(), 1 );
+               equal( ui.oldHeader.size(), 0 );
+               equal( ui.oldContent.size(), 0 );
+               equal( ui.newHeader.size(), 1 );
                strictEqual( ui.newHeader[ 0 ], headers[ 0 ] );
-               equals( ui.newContent.size(), 1 );
+               equal( ui.newContent.size(), 1 );
                strictEqual( ui.newContent[ 0 ], content[ 0 ] );
        });
        element.accordion( "option", "active", 0 );
 
        element.one( "accordionactivate", function( event, ui ) {
-               equals( ui.oldHeader.size(), 1 );
+               equal( ui.oldHeader.size(), 1 );
                strictEqual( ui.oldHeader[ 0 ], headers[ 0 ] );
-               equals( ui.oldContent.size(), 1 );
+               equal( ui.oldContent.size(), 1 );
                strictEqual( ui.oldContent[ 0 ], content[ 0 ] );
-               equals( ui.newHeader.size(), 1 );
+               equal( ui.newHeader.size(), 1 );
                strictEqual( ui.newHeader[ 0 ], headers[ 1 ] );
-               equals( ui.newContent.size(), 1 );
+               equal( ui.newContent.size(), 1 );
                strictEqual( ui.newContent[ 0 ], content[ 1 ] );
        });
        headers.eq( 1 ).click();
 
        element.one( "accordionactivate", function( event, ui ) {
-               equals( ui.oldHeader.size(), 1 );
+               equal( ui.oldHeader.size(), 1 );
                strictEqual( ui.oldHeader[ 0 ], headers[ 1 ] );
-               equals( ui.oldContent.size(), 1 );
+               equal( ui.oldContent.size(), 1 );
                strictEqual( ui.oldContent[ 0 ], content[ 1 ] );
-               equals( ui.newHeader.size(), 0 );
-               equals( ui.newContent.size(), 0 );
+               equal( ui.newHeader.size(), 0 );
+               equal( ui.newContent.size(), 0 );
        });
        element.accordion( "option", "active", false );
 

diff --git a/tests/unit/accordion/accordion_options.js b/tests/unit/accordion/accordion_options.js
index 7bd6f2e740ef039046ce0e8415a1848d7c9c9d39..57762dec88f4e2f30daa4e8482c97d4e9d28fef6 100644 (file)
--- a/tests/unit/accordion/accordion_options.js
+++ b/tests/unit/accordion/accordion_options.js
@@ -4,7 +4,7 @@ module( "accordion: options", accordionSetupTeardown() );
 
 test( "{ active: default }", function() {
        var element = $( "#list1" ).accordion();
-       equals( element.accordion( "option", "active" ), 0 );
+       equal( element.accordion( "option", "active" ), 0 );
        accordion_state( element, 1, 0, 0 );
 });
 
@@ -14,12 +14,12 @@ test( "{ active: false }", function() {
                collapsible: true
        });
        accordion_state( element, 0, 0, 0 );
-       equals( element.find( ".ui-accordion-header.ui-state-active" ).size(), 0, "no headers selected" );
-       equals( element.accordion( "option", "active" ), false );
+       equal( element.find( ".ui-accordion-header.ui-state-active" ).size(), 0, "no headers selected" );
+       equal( element.accordion( "option", "active" ), false );
 
        element.accordion( "option", "collapsible", false );
        accordion_state( element, 1, 0, 0 );
-       equals( element.accordion( "option", "active" ), 0 );
+       equal( element.accordion( "option", "active" ), 0 );
 
        element.accordion( "destroy" );
        element.accordion({
@@ -33,19 +33,19 @@ test( "{ active: Number }", function() {
        var element = $( "#list1" ).accordion({
                active: 2
        });
-       equals( element.accordion( "option", "active" ), 2 );
+       equal( element.accordion( "option", "active" ), 2 );
        accordion_state( element, 0, 0, 1 );
 
        element.accordion( "option", "active", 0 );
-       equals( element.accordion( "option", "active" ), 0 );
+       equal( element.accordion( "option", "active" ), 0 );
        accordion_state( element, 1, 0, 0 );
 
        element.find( ".ui-accordion-header" ).eq( 1 ).click();
-       equals( element.accordion( "option", "active" ), 1 );
+       equal( element.accordion( "option", "active" ), 1 );
        accordion_state( element, 0, 1, 0 );
 
        element.accordion( "option", "active", 10 );
-       equals( element.accordion( "option", "active" ), 1 );
+       equal( element.accordion( "option", "active" ), 1 );
        accordion_state( element, 0, 1, 0 );
 });
 
@@ -54,19 +54,19 @@ if ( $.uiBackCompat === false ) {
                var element = $( "#list1" ).accordion({
                        active: -1
                });
-               equals( element.accordion( "option", "active" ), 2 );
+               equal( element.accordion( "option", "active" ), 2 );
                accordion_state( element, 0, 0, 1 );
 
                element.accordion( "option", "active", -2 );
-               equals( element.accordion( "option", "active" ), 1 );
+               equal( element.accordion( "option", "active" ), 1 );
                accordion_state( element, 0, 1, 0 );
 
                element.accordion( "option", "active", -10 );
-               equals( element.accordion( "option", "active" ), 1 );
+               equal( element.accordion( "option", "active" ), 1 );
                accordion_state( element, 0, 1, 0 );
 
                element.accordion( "option", "active", -3 );
-               equals( element.accordion( "option", "active" ), 0 );
+               equal( element.accordion( "option", "active" ), 0 );
                accordion_state( element, 1, 0, 0 );
        });
 }
@@ -101,7 +101,7 @@ test( "{ collapsible: true }", function() {
        accordion_state( element, 0, 1, 0 );
 
        element.find( ".ui-accordion-header" ).eq( 1 ).click();
-       equals( element.accordion( "option", "active" ), false );
+       equal( element.accordion( "option", "active" ), false );
        accordion_state( element, 0, 0, 0 );
 });
 
@@ -238,8 +238,8 @@ test( "{ heightStyle: 'fill' } with multiple siblings", function() {
 test( "{ icons: false }", function() {
        var element = $( "#list1" );
        function icons( on ) {
-               same( element.find( "span.ui-icon").length, on ? 3 : 0 );
-               same( element.hasClass( "ui-accordion-icons" ), on );
+               deepEqual( element.find( "span.ui-icon").length, on ? 3 : 0 );
+               deepEqual( element.hasClass( "ui-accordion-icons" ), on );
        }
        element.accordion();
        icons( true );