From b85e11564ab16eb420ecccdcb8e328e37458c8f3 Mon Sep 17 00:00:00 2001 From: Scott González Date: Wed, 23 Mar 2011 10:07:09 -0400 Subject: Accordion: Removed static test pages. Added unit tests for dl markup structure. --- tests/static/accordion/default.html | 39 --------------------------- tests/static/accordion/dl.html | 39 --------------------------- tests/static/accordion/ul.html | 49 ---------------------------------- tests/unit/accordion/accordio.html | 21 +++++++++++++++ tests/unit/accordion/accordion.html | 21 +++++++++++++++ tests/unit/accordion/accordion_core.js | 22 ++++++++------- 6 files changed, 54 insertions(+), 137 deletions(-) delete mode 100644 tests/static/accordion/default.html delete mode 100644 tests/static/accordion/dl.html delete mode 100644 tests/static/accordion/ul.html diff --git a/tests/static/accordion/default.html b/tests/static/accordion/default.html deleted file mode 100644 index 2d39cf123..000000000 --- a/tests/static/accordion/default.html +++ /dev/null @@ -1,39 +0,0 @@ - - - - - Accordion Static Test : Default - - - - - - - - -
-

- - Accordion Header 1 -

-
- Accordion Content 1 -
-

- - Accordion Header 2 -

- -

- - Accordion Header 3 -

- -
- - - diff --git a/tests/static/accordion/dl.html b/tests/static/accordion/dl.html deleted file mode 100644 index fb7bbd80d..000000000 --- a/tests/static/accordion/dl.html +++ /dev/null @@ -1,39 +0,0 @@ - - - - - Accordion Static Test : DL - - - - - - - - -
-
- - Accordion Header 1 -
-
- Accordion Content 1 -
-
- - Accordion Header 2 -
-
- Accordion Content 2 -
-
- - Accordion Header 3 -
-
- Accordion Content 2 -
-
- - - diff --git a/tests/static/accordion/ul.html b/tests/static/accordion/ul.html deleted file mode 100644 index cc6391763..000000000 --- a/tests/static/accordion/ul.html +++ /dev/null @@ -1,49 +0,0 @@ - - - - - Accordion Static Test : UL - - - - - - - - - - - - diff --git a/tests/unit/accordion/accordio.html b/tests/unit/accordion/accordio.html index fe0e1b311..4e4df72b4 100644 --- a/tests/unit/accordion/accordio.html +++ b/tests/unit/accordion/accordio.html @@ -136,6 +136,27 @@ +
+
+ Accordion Header 1 +
+
+ Accordion Content 1 +
+
+ Accordion Header 2 +
+
+ Accordion Content 2 +
+
+ Accordion Header 3 +
+
+ Accordion Content 3 +
+
+ diff --git a/tests/unit/accordion/accordion.html b/tests/unit/accordion/accordion.html index bf5b0a0e8..65fd16ab6 100644 --- a/tests/unit/accordion/accordion.html +++ b/tests/unit/accordion/accordion.html @@ -138,6 +138,27 @@ +
+
+ Accordion Header 1 +
+
+ Accordion Content 1 +
+
+ Accordion Header 2 +
+
+ Accordion Content 2 +
+
+ Accordion Header 3 +
+
+ Accordion Content 3 +
+
+ diff --git a/tests/unit/accordion/accordion_core.js b/tests/unit/accordion/accordion_core.js index 263959851..05479faf9 100644 --- a/tests/unit/accordion/accordion_core.js +++ b/tests/unit/accordion/accordion_core.js @@ -2,16 +2,18 @@ module( "accordion: core", accordionSetupTeardown() ); -test( "markup structure", function() { - var ac = $( "#navigation" ).accordion(); - ok( ac.hasClass( "ui-accordion" ), "main element is .ui-accordion" ); - equal( ac.find( ".ui-accordion-header" ).length, 3, - ".ui-accordion-header elements exist, correct number" ); - equal( ac.find( ".ui-accordion-content" ).length, 3, - ".ui-accordion-content elements exist, correct number" ); - same( ac.find( ".ui-accordion-header" ).next().get(), - ac.find( ".ui-accordion-content" ).get(), - "content panels come immediately after headers" ); +$.each( { div: "#list1", ul: "#navigation", dl: "#accordion-dl" }, function( type, selector ) { + test( "markup structure: " + type, function() { + var ac = $( selector ).accordion(); + ok( ac.hasClass( "ui-accordion" ), "main element is .ui-accordion" ); + equal( ac.find( ".ui-accordion-header" ).length, 3, + ".ui-accordion-header elements exist, correct number" ); + equal( ac.find( ".ui-accordion-content" ).length, 3, + ".ui-accordion-content elements exist, correct number" ); + same( ac.find( ".ui-accordion-header" ).next().get(), + ac.find( ".ui-accordion-content" ).get(), + "content panels come immediately after headers" ); + }); }); test( "handle click on header-descendant", function() { -- cgit v1.2.3