diff --git a/tests/static/accordion/default.html b/tests/static/accordion/default.html deleted file mode 100644 index 2d39cf123c..0000000000 --- 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 fb7bbd80da..0000000000 --- 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 cc63917632..0000000000 --- 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 fe0e1b3110..4e4df72b4a 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 bf5b0a0e86..65fd16ab64 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 2639598518..05479faf92 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() {