From 140d90a9a4d0c77658ff8a811aebe899dcf11f2b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Scott=20Gonz=C3=A1lez?= Date: Mon, 24 Jan 2011 15:45:29 -0500 Subject: [PATCH] Accordion: Test cleanup. --- tests/unit/accordion/accordion_core.js | 59 +++++++++---------- tests/unit/accordion/accordion_defaults.js | 7 +-- tests/unit/accordion/accordion_events.js | 54 +++++++++-------- .../accordion.html} | 30 +++++----- .../accordion_defaults_deprecated.js | 5 +- .../{ => deprecated}/accordion_deprecated.js | 0 ui/jquery.ui.accordion.js | 4 +- 7 files changed, 75 insertions(+), 84 deletions(-) rename tests/unit/accordion/{accordion_deprecated.html => deprecated/accordion.html} (81%) rename tests/unit/accordion/{ => deprecated}/accordion_defaults_deprecated.js (93%) rename tests/unit/accordion/{ => deprecated}/accordion_deprecated.js (100%) diff --git a/tests/unit/accordion/accordion_core.js b/tests/unit/accordion/accordion_core.js index 40a711abf..fa0facc80 100644 --- a/tests/unit/accordion/accordion_core.js +++ b/tests/unit/accordion/accordion_core.js @@ -1,40 +1,35 @@ -/* - * accordion_core.js - */ +(function( $ ) { +module( "accordion: core" ); -(function($) { - -module("accordion: core"); - -test("handle click on header-descendant", function() { - var ac = $('#navigation').accordion({ autoHeight: false }); - $('#navigation h2:eq(1) a').trigger("click"); - state(ac, 0, 1, 0); +test( "handle click on header-descendant", function() { + var ac = $( "#navigation" ).accordion(); + $( "#navigation h2:eq(1) a" ).click(); + state( ac, 0, 1, 0 ); }); -test("ui-accordion-heading class added to headers anchor", function() { - expect(1); - var ac = $("#list1").accordion(); - var anchors = $(".ui-accordion-heading"); - equals( anchors.length, "3"); +test( "ui-accordion-heading class added to headers anchor", function() { + expect( 1 ); + var ac = $( "#list1" ).accordion(); + var anchors = $( ".ui-accordion-heading" ); + equals( anchors.length, 3 ); }); -test("accessibility", function () { - expect(9); - var ac = $('#list1').accordion().accordion("option", "active", 1); - var headers = $(".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( ac.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"); - ac.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"); +test( "accessibility", function () { + expect( 9 ); + var ac = $( "#list1" ).accordion().accordion( "option", "active", 1 ); + var headers = $( ".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( ac.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" ); + ac.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" ); }); -})(jQuery); +}( jQuery ) ); diff --git a/tests/unit/accordion/accordion_defaults.js b/tests/unit/accordion/accordion_defaults.js index 78630adc7..c2904d39a 100644 --- a/tests/unit/accordion/accordion_defaults.js +++ b/tests/unit/accordion/accordion_defaults.js @@ -1,6 +1,3 @@ -/* - * accordion_defaults.js - */ var accordion_defaults = { active: 0, @@ -11,8 +8,8 @@ var accordion_defaults = { header: "> li > :first-child,> :not(li):even", heightStyle: "auto", icons: { - "header": "ui-icon-triangle-1-e", - "activeHeader": "ui-icon-triangle-1-s" + "activeHeader": "ui-icon-triangle-1-s", + "header": "ui-icon-triangle-1-e" } }; diff --git a/tests/unit/accordion/accordion_events.js b/tests/unit/accordion/accordion_events.js index 4798f7404..ff9590eac 100644 --- a/tests/unit/accordion/accordion_events.js +++ b/tests/unit/accordion/accordion_events.js @@ -1,30 +1,32 @@ -/* - * accordion_events.js - */ -(function($) { +(function( $ ) { -module("accordion: events"); +module( "accordion: events" ); -test("accordionchange event, open closed and close again", function() { - expect(8); - $("#list1").accordion({ - active: false, - collapsible: true - }) - .one("accordionchange", function(event, ui) { - equals( ui.oldHeader.size(), 0 ); - equals( ui.oldContent.size(), 0 ); - equals( ui.newHeader.size(), 1 ); - equals( ui.newContent.size(), 1 ); - }) - .accordion("option", "active", 0) - .one("accordionchange", function(event, ui) { - equals( ui.oldHeader.size(), 1 ); - equals( ui.oldContent.size(), 1 ); - equals( ui.newHeader.size(), 0 ); - equals( ui.newContent.size(), 0 ); - }) - .accordion("option", "active", false); +// TODO: verify correct elements in ui properties +// TODO: add tests for switching between active panels (not collapsed) +// TODO: add tests for changestart +// TODO: move change/changestart to deprecated tests (add activate/beforeactivate) +test( "accordionchange event, open closed and close again", function() { + expect( 8 ); + $( "#list1" ) + .accordion({ + active: false, + collapsible: true + }) + .one( "accordionchange", function( event, ui ) { + equals( ui.oldHeader.size(), 0 ); + equals( ui.oldContent.size(), 0 ); + equals( ui.newHeader.size(), 1 ); + equals( ui.newContent.size(), 1 ); + }) + .accordion( "option", "active", 0 ) + .one( "accordionchange", function( event, ui ) { + equals( ui.oldHeader.size(), 1 ); + equals( ui.oldContent.size(), 1 ); + equals( ui.newHeader.size(), 0 ); + equals( ui.newContent.size(), 0 ); + }) + .accordion( "option", "active", false ); }); -})(jQuery); +}( jQuery ) ); diff --git a/tests/unit/accordion/accordion_deprecated.html b/tests/unit/accordion/deprecated/accordion.html similarity index 81% rename from tests/unit/accordion/accordion_deprecated.html rename to tests/unit/accordion/deprecated/accordion.html index c104df4d5..d5e55f2e4 100644 --- a/tests/unit/accordion/accordion_deprecated.html +++ b/tests/unit/accordion/deprecated/accordion.html @@ -4,17 +4,17 @@ jQuery UI Accordion Test Suite - + - - - - + + + + - - - - + + + + - + - - - - + + + + - +