From c96c2497803779c11d8e666f2f8129bbba01fee9 Mon Sep 17 00:00:00 2001 From: Scott González Date: Mon, 24 Jan 2011 14:38:23 -0500 Subject: Accordion: First pass at splitting out tests for deprecated functionality. --- tests/unit/accordion/accordion.html | 85 ++++++------ tests/unit/accordion/accordion_defaults.js | 16 +-- .../accordion/accordion_defaults_deprecated.js | 25 ++++ tests/unit/accordion/accordion_deprecated.html | 139 +++++++++++++++++++ tests/unit/accordion/accordion_deprecated.js | 154 +++++++++++++++++++++ tests/unit/accordion/accordion_methods.js | 59 +------- tests/unit/accordion/accordion_options.js | 75 ---------- 7 files changed, 369 insertions(+), 184 deletions(-) create mode 100644 tests/unit/accordion/accordion_defaults_deprecated.js create mode 100644 tests/unit/accordion/accordion_deprecated.html create mode 100644 tests/unit/accordion/accordion_deprecated.js (limited to 'tests/unit/accordion') diff --git a/tests/unit/accordion/accordion.html b/tests/unit/accordion/accordion.html index 61d168386..88226be31 100644 --- a/tests/unit/accordion/accordion.html +++ b/tests/unit/accordion/accordion.html @@ -1,55 +1,58 @@ - + jQuery UI Accordion Test Suite - + - - - - + + + + + - - - - + + + + - - - - - - - - - + + + + + + + + diff --git a/tests/unit/accordion/accordion_defaults.js b/tests/unit/accordion/accordion_defaults.js index d29c1e848..78630adc7 100644 --- a/tests/unit/accordion/accordion_defaults.js +++ b/tests/unit/accordion/accordion_defaults.js @@ -5,19 +5,15 @@ var accordion_defaults = { active: 0, animated: false, - autoHeight: true, - clearStyle: false, collapsible: false, disabled: false, event: "click", - fillSpace: false, header: "> li > :first-child,> :not(li):even", - heightStyle: null, - icons: { "header": "ui-icon-triangle-1-e", - "activeHeader": null, - "headerSelected": "ui-icon-triangle-1-s" }, - navigation: false, - navigationFilter: function() {} + heightStyle: "auto", + icons: { + "header": "ui-icon-triangle-1-e", + "activeHeader": "ui-icon-triangle-1-s" + } }; -commonWidgetTests('accordion', { defaults: accordion_defaults }); +commonWidgetTests( "accordion", { defaults: accordion_defaults } ); diff --git a/tests/unit/accordion/accordion_defaults_deprecated.js b/tests/unit/accordion/accordion_defaults_deprecated.js new file mode 100644 index 000000000..41998ea7a --- /dev/null +++ b/tests/unit/accordion/accordion_defaults_deprecated.js @@ -0,0 +1,25 @@ +/* + * accordion_defaults.js + */ + +var accordion_defaults = { + active: 0, + animated: false, + autoHeight: true, + clearStyle: false, + collapsible: false, + disabled: false, + event: "click", + fillSpace: false, + header: "> li > :first-child,> :not(li):even", + heightStyle: null, + icons: { + "header": "ui-icon-triangle-1-e", + "activeHeader": null, + "headerSelected": "ui-icon-triangle-1-s" + }, + navigation: false, + navigationFilter: function() {} +}; + +commonWidgetTests( "accordion", { defaults: accordion_defaults } ); diff --git a/tests/unit/accordion/accordion_deprecated.html b/tests/unit/accordion/accordion_deprecated.html new file mode 100644 index 000000000..c104df4d5 --- /dev/null +++ b/tests/unit/accordion/accordion_deprecated.html @@ -0,0 +1,139 @@ + + + + + jQuery UI Accordion Test Suite + + + + + + + + + + + + + + + + + + + + + + + + + + + +

jQuery UI Accordion Test Suite

+

+

+
    +
+ +
+ +
+
+

There is one obvious advantage:

+
+

+ You've seen it coming! +
+ Buy now and get nothing for free! +
+ Well, at least no free beer. Perhaps a bear, if you can afford it. +

+
+

Now that you've got...

+
+

+ your bear, you have to admit it! +
+ No, we aren't selling bears. +

+

+ We could talk about renting one. +

+
+

Rent one bear, ...

+
+

+ get two for three beer. +

+

+ And now, for something completely different. +

+
+
+
+ + + +
+ + + diff --git a/tests/unit/accordion/accordion_deprecated.js b/tests/unit/accordion/accordion_deprecated.js new file mode 100644 index 000000000..b219cf8c3 --- /dev/null +++ b/tests/unit/accordion/accordion_deprecated.js @@ -0,0 +1,154 @@ +/* + * accordion_core.js + */ + + +(function($) { + +module("accordion (deprecated): expanded active option, activate method"); + +test("activate", function() { + var expected = $('#list1').accordion(), + actual = expected.accordion('activate', 2); + equals(actual, expected, 'activate is chainable'); +}); + +test("activate, numeric", function() { + var ac = $('#list1').accordion({ active: 1 }); + state(ac, 0, 1, 0); + ac.accordion("activate", 2); + state(ac, 0, 0, 1); + ac.accordion("activate", 0); + state(ac, 1, 0, 0); + ac.accordion("activate", 1); + state(ac, 0, 1, 0); + ac.accordion("activate", 2); + state(ac, 0, 0, 1); +}); + +test("activate, boolean and numeric, collapsible:true", function() { + var ac = $('#list1').accordion({collapsible: true}).accordion("activate", 2); + state(ac, 0, 0, 1); + ok("x", "----"); + ac.accordion("activate", 0); + state(ac, 1, 0, 0); + ok("x", "----"); + ac.accordion("activate", -1); + state(ac, 0, 0, 0); +}); + +test("activate, boolean, collapsible: false", function() { + var ac = $('#list1').accordion().accordion("activate", 2); + state(ac, 0, 0, 1); + ac.accordion("activate", false); + state(ac, 0, 0, 1); +}); + +test("activate, string expression", function() { + var ac = $('#list1').accordion({ active: "h3:last" }); + state(ac, 0, 0, 1); + ac.accordion("activate", ":first"); + state(ac, 1, 0, 0); + ac.accordion("activate", ":eq(1)"); + state(ac, 0, 1, 0); + ac.accordion("activate", ":last"); + state(ac, 0, 0, 1); +}); + +test("activate, jQuery or DOM element", function() { + var ac = $('#list1').accordion({ active: $("#list1 h3:last") }); + state(ac, 0, 0, 1); + ac.accordion("activate", $("#list1 h3:first")); + state(ac, 1, 0, 0); + ac.accordion("activate", $("#list1 h3")[1]); + state(ac, 0, 1, 0); +}); + +test("{ active: Selector }", function() { + var ac = $("#list1").accordion({ + active: "h3:last" + }); + state(ac, 0, 0, 1); + ac.accordion('option', 'active', "h3:eq(1)"); + state(ac, 0, 1, 0); +}); + +test("{ active: Element }", function() { + var ac = $("#list1").accordion({ + active: $("#list1 h3:last")[0] + }); + state(ac, 0, 0, 1); + ac.accordion('option', 'active', $("#list1 h3:eq(1)")[0]); + state(ac, 0, 1, 0); +}); + +test("{ active: jQuery Object }", function() { + var ac = $("#list1").accordion({ + active: $("#list1 h3:last") + }); + state(ac, 0, 0, 1); + ac.accordion('option', 'active', $("#list1 h3:eq(1)")); + state(ac, 0, 1, 0); +}); + + + + + + +module("accordion (deprecated) - height options"); + +test("{ autoHeight: true }, default", function() { + equalHeights($('#navigation').accordion({ autoHeight: true }), 95, 130); +}); + +test("{ autoHeight: false }", function() { + var accordion = $('#navigation').accordion({ autoHeight: false }); + var sizes = []; + accordion.find(".ui-accordion-content").each(function() { + sizes.push($(this).height()); + }); + ok( sizes[0] >= 70 && sizes[0] <= 90, "was " + sizes[0] ); + ok( sizes[1] >= 98 && sizes[1] <= 126, "was " + sizes[1] ); + ok( sizes[2] >= 42 && sizes[2] <= 54, "was " + sizes[2] ); +}); + +// fillSpace: false == autoHeight: true, covered above +test("{ fillSpace: true }", function() { + $("#navigationWrapper").height(500); + equalHeights($('#navigation').accordion({ fillSpace: true }), 446, 458); +}); + +test("{ fillSpace: true } with sibling", function() { + $("#navigationWrapper").height(500); + var sibling = $("

Lorem Ipsum

"); + $("#navigationWrapper").prepend( sibling.height(100) ); + //sibling.outerHeight(true) == 126 + equalHeights($('#navigation').accordion({ fillSpace: true}), 320, 332); +}); + +test("{ fillSpace: true } with multiple siblings", function() { + $("#navigationWrapper").height(500); + var sibling = $("

Lorem Ipsum

"); + $("#navigationWrapper") + .prepend( sibling.clone().height(100) ) + .prepend( sibling.clone().height(100).css( "position", "absolute" ) ) + .prepend( sibling.clone().height(50) ); + //sibling.outerHeight(true) == 126 + equalHeights($('#navigation').accordion({ fillSpace: true}), 244, 256); +}); + + + + +module("accordion (deprecated) - icons"); + +test("change headerSelected option after creation", function() { + var list = $("#list1"); + list.accordion( { icons: { "activeHeader": "test" } } ); + equals( $( "#list1 span.test" ).length, 1); + list.accordion( "option", "icons", { "headerSelected": "deprecated" } ); + equals( $( "#list1 span.deprecated" ).length, 1); +}); + +})(jQuery); diff --git a/tests/unit/accordion/accordion_methods.js b/tests/unit/accordion/accordion_methods.js index c801851d0..c6754d277 100644 --- a/tests/unit/accordion/accordion_methods.js +++ b/tests/unit/accordion/accordion_methods.js @@ -57,66 +57,9 @@ test("disable", function() { state(expected, 0, 1, 0) }); -test("activate", function() { - var expected = $('#list1').accordion(), - actual = expected.accordion('activate', 2); - equals(actual, expected, 'activate is chainable'); -}); - -test("activate, numeric", function() { - var ac = $('#list1').accordion({ active: 1 }); - state(ac, 0, 1, 0); - ac.accordion("activate", 2); - state(ac, 0, 0, 1); - ac.accordion("activate", 0); - state(ac, 1, 0, 0); - ac.accordion("activate", 1); - state(ac, 0, 1, 0); - ac.accordion("activate", 2); - state(ac, 0, 0, 1); -}); - -test("activate, boolean and numeric, collapsible:true", function() { - var ac = $('#list1').accordion({collapsible: true}).accordion("activate", 2); - state(ac, 0, 0, 1); - ok("x", "----"); - ac.accordion("activate", 0); - state(ac, 1, 0, 0); - ok("x", "----"); - ac.accordion("activate", -1); - state(ac, 0, 0, 0); -}); - -test("activate, boolean, collapsible: false", function() { - var ac = $('#list1').accordion().accordion("activate", 2); - state(ac, 0, 0, 1); - ac.accordion("activate", false); - state(ac, 0, 0, 1); -}); - -test("activate, string expression", function() { - var ac = $('#list1').accordion({ active: "h3:last" }); - state(ac, 0, 0, 1); - ac.accordion("activate", ":first"); - state(ac, 1, 0, 0); - ac.accordion("activate", ":eq(1)"); - state(ac, 0, 1, 0); - ac.accordion("activate", ":last"); - state(ac, 0, 0, 1); -}); - -test("activate, jQuery or DOM element", function() { - var ac = $('#list1').accordion({ active: $("#list1 h3:last") }); - state(ac, 0, 0, 1); - ac.accordion("activate", $("#list1 h3:first")); - state(ac, 1, 0, 0); - ac.accordion("activate", $("#list1 h3")[1]); - state(ac, 0, 1, 0); -}); - test("refresh", function() { var expected = $('#navigation').parent().height(300).end().accordion({ - fillSpace: true + heightStyle: "fill" }); equalHeights(expected, 246, 258); diff --git a/tests/unit/accordion/accordion_options.js b/tests/unit/accordion/accordion_options.js index abfb82d78..c7b4038ef 100644 --- a/tests/unit/accordion/accordion_options.js +++ b/tests/unit/accordion/accordion_options.js @@ -11,33 +11,6 @@ test("{ active: first child }, default", function() { state(ac, 1, 0, 0) }); -test("{ active: Selector }", function() { - var ac = $("#list1").accordion({ - active: "h3:last" - }); - state(ac, 0, 0, 1); - ac.accordion('option', 'active', "h3:eq(1)"); - state(ac, 0, 1, 0); -}); - -test("{ active: Element }", function() { - var ac = $("#list1").accordion({ - active: $("#list1 h3:last")[0] - }); - state(ac, 0, 0, 1); - ac.accordion('option', 'active', $("#list1 h3:eq(1)")[0]); - state(ac, 0, 1, 0); -}); - -test("{ active: jQuery Object }", function() { - var ac = $("#list1").accordion({ - active: $("#list1 h3:last") - }); - state(ac, 0, 0, 1); - ac.accordion('option', 'active', $("#list1 h3:eq(1)")); - state(ac, 0, 1, 0); -}); - test("{ active: false }", function() { var ac = $("#list1").accordion({ active: false, @@ -65,25 +38,10 @@ test("{ active: Number }", function() { equals( $("#list1").accordion('option', 'active'), 0); }); -test("{ autoHeight: true }, default", function() { - equalHeights($('#navigation').accordion({ autoHeight: true }), 95, 130); -}); - test("{ heightStyle: 'auto' }, default", function() { equalHeights($('#navigation').accordion({ heightStyle: 'auto' }), 95, 130); }); -test("{ autoHeight: false }", function() { - var accordion = $('#navigation').accordion({ autoHeight: false }); - var sizes = []; - accordion.find(".ui-accordion-content").each(function() { - sizes.push($(this).height()); - }); - ok( sizes[0] >= 70 && sizes[0] <= 90, "was " + sizes[0] ); - ok( sizes[1] >= 98 && sizes[1] <= 126, "was " + sizes[1] ); - ok( sizes[2] >= 42 && sizes[2] <= 54, "was " + sizes[2] ); -}); - test("{ heightStyle: 'content' }", function() { var accordion = $('#navigation').accordion({ heightStyle: 'content' }); var sizes = []; @@ -110,36 +68,11 @@ test("{ collapsible: true }", function() { state(ac, 0, 0, 0); }); -// fillSpace: false == autoHeight: true, covered above -test("{ fillSpace: true }", function() { - $("#navigationWrapper").height(500); - equalHeights($('#navigation').accordion({ fillSpace: true }), 446, 458); -}); - test("{ heightStyle: 'fill' }", function() { $("#navigationWrapper").height(500); equalHeights($('#navigation').accordion({ heightStyle: 'fill' }), 446, 458); }); -test("{ fillSpace: true } with sibling", function() { - $("#navigationWrapper").height(500); - var sibling = $("

Lorem Ipsum

"); - $("#navigationWrapper").prepend( sibling.height(100) ); - //sibling.outerHeight(true) == 126 - equalHeights($('#navigation').accordion({ fillSpace: true}), 320, 332); -}); - -test("{ fillSpace: true } with multiple siblings", function() { - $("#navigationWrapper").height(500); - var sibling = $("

Lorem Ipsum

"); - $("#navigationWrapper") - .prepend( sibling.clone().height(100) ) - .prepend( sibling.clone().height(100).css( "position", "absolute" ) ) - .prepend( sibling.clone().height(50) ); - //sibling.outerHeight(true) == 126 - equalHeights($('#navigation').accordion({ fillSpace: true}), 244, 256); -}); - test("{ header: '> li > :first-child,> :not(li):even' }, default", function() { state($("#list1").accordion(), 1, 0, 0); state($("#navigation").accordion(), 1, 0, 0); @@ -192,12 +125,4 @@ test("{ navigation: true, navigationFilter: content }", function() { equals( $("#navigation .ui-accordion-content:eq(2)").size(), 1, "third content active" ); }); -test("change headerSelected option after creation", function() { - var list = $("#list1"); - list.accordion( { icons: { "activeHeader": "test" } } ); - equals( $( "#list1 span.test" ).length, 1); - list.accordion( "option", "icons", { "headerSelected": "deprecated" } ); - equals( $( "#list1 span.deprecated" ).length, 1); -}); - })(jQuery); -- cgit v1.2.3