- - - diff --git a/tests/unit/accordion/core.js b/tests/unit/accordion/core.js index 0a39311624c..cd29e1506e0 100644 --- a/tests/unit/accordion/core.js +++ b/tests/unit/accordion/core.js @@ -1,129 +1,130 @@ define( [ + "lib/qunit", "jquery", "./helper", "ui/accordion" -], function( $, testHelper ) { +], function( QUnit, $, testHelper ) { var setupTeardown = testHelper.setupTeardown, state = testHelper.state; -module( "accordion: core", setupTeardown() ); +QUnit.module( "accordion: core", setupTeardown() ); $.each( { div: "#list1", ul: "#navigation", dl: "#accordion-dl" }, function( type, selector ) { - test( "markup structure: " + type, function( assert ) { - expect( 10 ); + QUnit.test( "markup structure: " + type, function( assert ) { + assert.expect( 10 ); var element = $( selector ).accordion(), headers = element.find( ".ui-accordion-header" ), content = headers.next(); assert.hasClasses( element, "ui-accordion ui-widget" ); - equal( headers.length, 3, ".ui-accordion-header elements exist, correct number" ); + assert.equal( headers.length, 3, ".ui-accordion-header elements exist, correct number" ); assert.hasClasses( headers[ 0 ], "ui-accordion-header ui-accordion-header-active ui-accordion-icons" ); assert.hasClasses( headers[ 1 ], "ui-accordion-header ui-accordion-header-collapsed ui-accordion-icons" ); assert.hasClasses( headers[ 2 ], "ui-accordion-header ui-accordion-header-collapsed ui-accordion-icons" ); - equal( content.length, 3, ".ui-accordion-content elements exist, correct number" ); + assert.equal( content.length, 3, ".ui-accordion-content elements exist, correct number" ); assert.hasClasses( content[ 0 ], "ui-accordion-content ui-widget-content ui-accordion-content-active" ); assert.hasClasses( content[ 1 ], "ui-accordion-content ui-widget-content" ); assert.hasClasses( content[ 2 ], "ui-accordion-content ui-widget-content" ); - deepEqual( element.find( ".ui-accordion-header" ).next().get(), + assert.deepEqual( element.find( ".ui-accordion-header" ).next().get(), element.find( ".ui-accordion-content" ).get(), "content panels come immediately after headers" ); }); }); -test( "handle click on header-descendant", function() { - expect( 1 ); +QUnit.test( "handle click on header-descendant", function( assert ) { + assert.expect( 1 ); var element = $( "#navigation" ).accordion(); $( "#navigation h2:eq(1) a" ).trigger( "click" ); - state( element, 0, 1, 0 ); + state( assert, element, 0, 1, 0 ); }); -test( "accessibility", function () { - expect( 61 ); +QUnit.test( "accessibility", function ( assert ) { + assert.expect( 61 ); var element = $( "#list1" ).accordion({ active: 1, collapsible: true }), headers = element.find( ".ui-accordion-header" ); - equal( element.attr( "role" ), "tablist", "element role" ); + assert.equal( element.attr( "role" ), "tablist", "element role" ); headers.each(function( i ) { var header = headers.eq( i ), panel = header.next(); - equal( header.attr( "role" ), "tab", "header " + i + " role" ); - equal( header.attr( "aria-controls" ), panel.attr( "id" ), "header " + i + " aria-controls" ); - equal( panel.attr( "role" ), "tabpanel", "panel " + i + " role" ); - equal( panel.attr( "aria-labelledby" ), header.attr( "id" ), "panel " + i + " aria-labelledby" ); + assert.equal( header.attr( "role" ), "tab", "header " + i + " role" ); + assert.equal( header.attr( "aria-controls" ), panel.attr( "id" ), "header " + i + " aria-controls" ); + assert.equal( panel.attr( "role" ), "tabpanel", "panel " + i + " role" ); + assert.equal( panel.attr( "aria-labelledby" ), header.attr( "id" ), "panel " + i + " aria-labelledby" ); }); - equal( headers.eq( 1 ).attr( "tabindex" ), 0, "active header has tabindex=0" ); - equal( headers.eq( 1 ).attr( "aria-selected" ), "true", "active tab (1) has aria-selected=true" ); - equal( headers.eq( 1 ).attr( "aria-expanded" ), "true", "active tab (1) has aria-expanded=true" ); - equal( headers.eq( 1 ).next().attr( "aria-hidden" ), "false", "active tabpanel (1) has aria-hidden=false" ); - equal( headers.eq( 0 ).attr( "tabindex" ), -1, "inactive header (0) has tabindex=-1" ); - equal( headers.eq( 0 ).attr( "aria-selected" ), "false", "inactive tab (0) has aria-selected=false" ); - equal( headers.eq( 0 ).attr( "aria-expanded" ), "false", "inactive tab (0) has aria-expanded=false" ); - equal( headers.eq( 0 ).next().attr( "aria-hidden" ), "true", "inactive tabpanel (0) has aria-hidden=true" ); - equal( headers.eq( 2 ).attr( "tabindex" ), -1, "inactive header (2) has tabindex=-1" ); - equal( headers.eq( 2 ).attr( "aria-selected" ), "false", "inactive tab (2) has aria-selected=false" ); - equal( headers.eq( 2 ).attr( "aria-expanded" ), "false", "inactive tab (2) has aria-expanded=false" ); - equal( headers.eq( 2 ).next().attr( "aria-hidden" ), "true", "inactive tabpanel (2) has aria-hidden=true" ); + assert.equal( headers.eq( 1 ).attr( "tabindex" ), 0, "active header has tabindex=0" ); + assert.equal( headers.eq( 1 ).attr( "aria-selected" ), "true", "active tab (1) has aria-selected=true" ); + assert.equal( headers.eq( 1 ).attr( "aria-expanded" ), "true", "active tab (1) has aria-expanded=true" ); + assert.equal( headers.eq( 1 ).next().attr( "aria-hidden" ), "false", "active tabpanel (1) has aria-hidden=false" ); + assert.equal( headers.eq( 0 ).attr( "tabindex" ), -1, "inactive header (0) has tabindex=-1" ); + assert.equal( headers.eq( 0 ).attr( "aria-selected" ), "false", "inactive tab (0) has aria-selected=false" ); + assert.equal( headers.eq( 0 ).attr( "aria-expanded" ), "false", "inactive tab (0) has aria-expanded=false" ); + assert.equal( headers.eq( 0 ).next().attr( "aria-hidden" ), "true", "inactive tabpanel (0) has aria-hidden=true" ); + assert.equal( headers.eq( 2 ).attr( "tabindex" ), -1, "inactive header (2) has tabindex=-1" ); + assert.equal( headers.eq( 2 ).attr( "aria-selected" ), "false", "inactive tab (2) has aria-selected=false" ); + assert.equal( headers.eq( 2 ).attr( "aria-expanded" ), "false", "inactive tab (2) has aria-expanded=false" ); + assert.equal( headers.eq( 2 ).next().attr( "aria-hidden" ), "true", "inactive tabpanel (2) has aria-hidden=true" ); element.accordion( "option", "active", 0 ); - equal( headers.eq( 0 ).attr( "tabindex" ), 0, "active header (0) has tabindex=0" ); - equal( headers.eq( 0 ).attr( "aria-selected" ), "true", "active tab (0) has aria-selected=true" ); - equal( headers.eq( 0 ).attr( "aria-expanded" ), "true", "active tab (0) has aria-expanded=true" ); - equal( headers.eq( 0 ).next().attr( "aria-hidden" ), "false", "active tabpanel (0) has aria-hidden=false" ); - equal( headers.eq( 1 ).attr( "tabindex" ), -1, "inactive header (1) has tabindex=-1" ); - equal( headers.eq( 1 ).attr( "aria-selected" ), "false", "inactive tab (1) has aria-selected=false" ); - equal( headers.eq( 1 ).attr( "aria-expanded" ), "false", "inactive tab (1) has aria-expanded=false" ); - equal( headers.eq( 1 ).next().attr( "aria-hidden" ), "true", "inactive tabpanel (1) has aria-hidden=true" ); - equal( headers.eq( 2 ).attr( "tabindex" ), -1, "inactive header (2) has tabindex=-1" ); - equal( headers.eq( 2 ).attr( "aria-selected" ), "false", "inactive tab (2) has aria-selected=false" ); - equal( headers.eq( 2 ).attr( "aria-expanded" ), "false", "inactive tab (2) has aria-expanded=false" ); - equal( headers.eq( 2 ).next().attr( "aria-hidden" ), "true", "inactive tabpanel (2) has aria-hidden=true" ); + assert.equal( headers.eq( 0 ).attr( "tabindex" ), 0, "active header (0) has tabindex=0" ); + assert.equal( headers.eq( 0 ).attr( "aria-selected" ), "true", "active tab (0) has aria-selected=true" ); + assert.equal( headers.eq( 0 ).attr( "aria-expanded" ), "true", "active tab (0) has aria-expanded=true" ); + assert.equal( headers.eq( 0 ).next().attr( "aria-hidden" ), "false", "active tabpanel (0) has aria-hidden=false" ); + assert.equal( headers.eq( 1 ).attr( "tabindex" ), -1, "inactive header (1) has tabindex=-1" ); + assert.equal( headers.eq( 1 ).attr( "aria-selected" ), "false", "inactive tab (1) has aria-selected=false" ); + assert.equal( headers.eq( 1 ).attr( "aria-expanded" ), "false", "inactive tab (1) has aria-expanded=false" ); + assert.equal( headers.eq( 1 ).next().attr( "aria-hidden" ), "true", "inactive tabpanel (1) has aria-hidden=true" ); + assert.equal( headers.eq( 2 ).attr( "tabindex" ), -1, "inactive header (2) has tabindex=-1" ); + assert.equal( headers.eq( 2 ).attr( "aria-selected" ), "false", "inactive tab (2) has aria-selected=false" ); + assert.equal( headers.eq( 2 ).attr( "aria-expanded" ), "false", "inactive tab (2) has aria-expanded=false" ); + assert.equal( headers.eq( 2 ).next().attr( "aria-hidden" ), "true", "inactive tabpanel (2) has aria-hidden=true" ); element.accordion( "option", "active", false ); - equal( headers.eq( 0 ).attr( "tabindex" ), 0, "previously active header (0) has tabindex=0" ); - equal( headers.eq( 0 ).attr( "aria-selected" ), "false", "inactive tab (0) has aria-selected=false" ); - equal( headers.eq( 0 ).attr( "aria-expanded" ), "false", "inactive tab (0) has aria-expanded=false" ); - equal( headers.eq( 0 ).next().attr( "aria-hidden" ), "true", "inactive tabpanel (0) has aria-hidden=true" ); - equal( headers.eq( 1 ).attr( "tabindex" ), -1, "inactive header (1) has tabindex=-1" ); - equal( headers.eq( 1 ).attr( "aria-selected" ), "false", "inactive tab (1) has aria-selected=false" ); - equal( headers.eq( 1 ).attr( "aria-expanded" ), "false", "inactive tab (1) has aria-expanded=false" ); - equal( headers.eq( 1 ).next().attr( "aria-hidden" ), "true", "inactive tabpanel (1) has aria-hidden=true" ); - equal( headers.eq( 2 ).attr( "tabindex" ), -1, "inactive header (2) has tabindex=-1" ); - equal( headers.eq( 2 ).attr( "aria-selected" ), "false", "inactive tab (2) has aria-selected=false" ); - equal( headers.eq( 2 ).attr( "aria-expanded" ), "false", "inactive tab (2) has aria-expanded=false" ); - equal( headers.eq( 2 ).next().attr( "aria-hidden" ), "true", "inactive tabpanel (2) has aria-hidden=true" ); + assert.equal( headers.eq( 0 ).attr( "tabindex" ), 0, "previously active header (0) has tabindex=0" ); + assert.equal( headers.eq( 0 ).attr( "aria-selected" ), "false", "inactive tab (0) has aria-selected=false" ); + assert.equal( headers.eq( 0 ).attr( "aria-expanded" ), "false", "inactive tab (0) has aria-expanded=false" ); + assert.equal( headers.eq( 0 ).next().attr( "aria-hidden" ), "true", "inactive tabpanel (0) has aria-hidden=true" ); + assert.equal( headers.eq( 1 ).attr( "tabindex" ), -1, "inactive header (1) has tabindex=-1" ); + assert.equal( headers.eq( 1 ).attr( "aria-selected" ), "false", "inactive tab (1) has aria-selected=false" ); + assert.equal( headers.eq( 1 ).attr( "aria-expanded" ), "false", "inactive tab (1) has aria-expanded=false" ); + assert.equal( headers.eq( 1 ).next().attr( "aria-hidden" ), "true", "inactive tabpanel (1) has aria-hidden=true" ); + assert.equal( headers.eq( 2 ).attr( "tabindex" ), -1, "inactive header (2) has tabindex=-1" ); + assert.equal( headers.eq( 2 ).attr( "aria-selected" ), "false", "inactive tab (2) has aria-selected=false" ); + assert.equal( headers.eq( 2 ).attr( "aria-expanded" ), "false", "inactive tab (2) has aria-expanded=false" ); + assert.equal( headers.eq( 2 ).next().attr( "aria-hidden" ), "true", "inactive tabpanel (2) has aria-hidden=true" ); element.accordion( "option", "active", 1 ); - equal( headers.eq( 1 ).attr( "tabindex" ), 0, "active header has tabindex=0" ); - equal( headers.eq( 1 ).attr( "aria-selected" ), "true", "active tab (1) has aria-selected=true" ); - equal( headers.eq( 1 ).attr( "aria-expanded" ), "true", "active tab (1) has aria-expanded=true" ); - equal( headers.eq( 1 ).next().attr( "aria-hidden" ), "false", "active tabpanel (1) has aria-hidden=false" ); - equal( headers.eq( 0 ).attr( "tabindex" ), -1, "inactive header (0) has tabindex=-1" ); - equal( headers.eq( 0 ).attr( "aria-selected" ), "false", "inactive tab (0) has aria-selected=false" ); - equal( headers.eq( 0 ).attr( "aria-expanded" ), "false", "inactive tab (0) has aria-expanded=false" ); - equal( headers.eq( 0 ).next().attr( "aria-hidden" ), "true", "inactive tabpanel (0) has aria-hidden=true" ); - equal( headers.eq( 2 ).attr( "tabindex" ), -1, "inactive header (2) has tabindex=-1" ); - equal( headers.eq( 2 ).attr( "aria-selected" ), "false", "inactive tab (2) has aria-selected=false" ); - equal( headers.eq( 2 ).attr( "aria-expanded" ), "false", "inactive tab (2) has aria-expanded=false" ); - equal( headers.eq( 2 ).next().attr( "aria-hidden" ), "true", "inactive tabpanel (2) has aria-hidden=true" ); + assert.equal( headers.eq( 1 ).attr( "tabindex" ), 0, "active header has tabindex=0" ); + assert.equal( headers.eq( 1 ).attr( "aria-selected" ), "true", "active tab (1) has aria-selected=true" ); + assert.equal( headers.eq( 1 ).attr( "aria-expanded" ), "true", "active tab (1) has aria-expanded=true" ); + assert.equal( headers.eq( 1 ).next().attr( "aria-hidden" ), "false", "active tabpanel (1) has aria-hidden=false" ); + assert.equal( headers.eq( 0 ).attr( "tabindex" ), -1, "inactive header (0) has tabindex=-1" ); + assert.equal( headers.eq( 0 ).attr( "aria-selected" ), "false", "inactive tab (0) has aria-selected=false" ); + assert.equal( headers.eq( 0 ).attr( "aria-expanded" ), "false", "inactive tab (0) has aria-expanded=false" ); + assert.equal( headers.eq( 0 ).next().attr( "aria-hidden" ), "true", "inactive tabpanel (0) has aria-hidden=true" ); + assert.equal( headers.eq( 2 ).attr( "tabindex" ), -1, "inactive header (2) has tabindex=-1" ); + assert.equal( headers.eq( 2 ).attr( "aria-selected" ), "false", "inactive tab (2) has aria-selected=false" ); + assert.equal( headers.eq( 2 ).attr( "aria-expanded" ), "false", "inactive tab (2) has aria-expanded=false" ); + assert.equal( headers.eq( 2 ).next().attr( "aria-hidden" ), "true", "inactive tabpanel (2) has aria-hidden=true" ); }); -asyncTest( "keyboard support", function( assert ) { - expect( 13 ); +QUnit.asyncTest( "keyboard support", function( assert ) { + assert.expect( 13 ); var element = $( "#list1" ).accordion(), headers = element.find( ".ui-accordion-header" ), anchor = headers.eq( 1 ).next().find( "a" ).eq( 0 ), keyCode = $.ui.keyCode; - equal( headers.filter( ".ui-state-focus" ).length, 0, "no headers focused on init" ); + assert.equal( headers.filter( ".ui-state-focus" ).length, 0, "no headers focused on init" ); headers.eq( 0 ).simulate( "focus" ); setTimeout( step1 ); @@ -180,13 +181,13 @@ asyncTest( "keyboard support", function( assert ) { } function step9() { - equal( element.accordion( "option", "active" ) , 2, "ENTER activates panel" ); + assert.equal( element.accordion( "option", "active" ) , 2, "ENTER activates panel" ); headers.eq( 1 ).simulate( "keydown", { keyCode: keyCode.SPACE } ); setTimeout( step10 ); } function step10() { - equal( element.accordion( "option", "active" ), 1, "SPACE activates panel" ); + assert.equal( element.accordion( "option", "active" ), 1, "SPACE activates panel" ); anchor.simulate( "focus" ); setTimeout( step11 ); } @@ -200,7 +201,7 @@ asyncTest( "keyboard support", function( assert ) { function step12() { assert.hasClasses( headers.eq( 1 ), "ui-state-focus", "CTRL+UP moves focus to header" ); - start(); + QUnit.start(); } }); diff --git a/tests/unit/accordion/events.js b/tests/unit/accordion/events.js index fef1a0aac50..ccf56bdabb0 100644 --- a/tests/unit/accordion/events.js +++ b/tests/unit/accordion/events.js @@ -1,16 +1,17 @@ define( [ + "lib/qunit", "jquery", "./helper", "ui/accordion" -], function( $, testHelper ) { +], function( QUnit, $, testHelper ) { var setupTeardown = testHelper.setupTeardown, state = testHelper.state; -module( "accordion: events", setupTeardown() ); +QUnit.module( "accordion: events", setupTeardown() ); -test( "create", function() { - expect( 10 ); +QUnit.test( "create", function( assert ) { + assert.expect( 10 ); var element = $( "#list1" ), headers = element.children( "h3" ), @@ -18,10 +19,10 @@ test( "create", function() { element.accordion({ create: function( event, ui ) { - equal( ui.header.length, 1, "header length" ); - strictEqual( ui.header[ 0 ], headers[ 0 ], "header" ); - equal( ui.panel.length, 1, "panel length" ); - strictEqual( ui.panel[ 0 ], contents[ 0 ], "panel" ); + assert.equal( ui.header.length, 1, "header length" ); + assert.strictEqual( ui.header[ 0 ], headers[ 0 ], "header" ); + assert.equal( ui.panel.length, 1, "panel length" ); + assert.strictEqual( ui.panel[ 0 ], contents[ 0 ], "panel" ); } }); element.accordion( "destroy" ); @@ -29,10 +30,10 @@ test( "create", function() { element.accordion({ active: 2, create: function( event, ui ) { - equal( ui.header.length, 1, "header length" ); - strictEqual( ui.header[ 0 ], headers[ 2 ], "header" ); - equal( ui.panel.length, 1, "panel length" ); - strictEqual( ui.panel[ 0 ], contents[ 2 ], "panel" ); + assert.equal( ui.header.length, 1, "header length" ); + assert.strictEqual( ui.header[ 0 ], headers[ 2 ], "header" ); + assert.equal( ui.panel.length, 1, "panel length" ); + assert.strictEqual( ui.panel[ 0 ], contents[ 2 ], "panel" ); } }); element.accordion( "destroy" ); @@ -41,15 +42,15 @@ test( "create", function() { active: false, collapsible: true, create: function( event, ui ) { - equal( ui.header.length, 0, "header length" ); - equal( ui.panel.length, 0, "panel length" ); + assert.equal( ui.header.length, 0, "header length" ); + assert.equal( ui.panel.length, 0, "panel length" ); } }); element.accordion( "destroy" ); }); -test( "beforeActivate", function() { - expect( 38 ); +QUnit.test( "beforeActivate", function( assert ) { + assert.expect( 38 ); var element = $( "#list1" ).accordion({ active: false, collapsible: true @@ -58,63 +59,63 @@ test( "beforeActivate", function() { content = element.find( ".ui-accordion-content" ); element.one( "accordionbeforeactivate", function( event, ui ) { - ok( !( "originalEvent" in event ) ); - equal( ui.oldHeader.length, 0 ); - equal( ui.oldPanel.length, 0 ); - equal( ui.newHeader.length, 1 ); - strictEqual( ui.newHeader[ 0 ], headers[ 0 ] ); - equal( ui.newPanel.length, 1 ); - strictEqual( ui.newPanel[ 0 ], content[ 0 ] ); - state( element, 0, 0, 0 ); + assert.ok( !( "originalEvent" in event ) ); + assert.equal( ui.oldHeader.length, 0 ); + assert.equal( ui.oldPanel.length, 0 ); + assert.equal( ui.newHeader.length, 1 ); + assert.strictEqual( ui.newHeader[ 0 ], headers[ 0 ] ); + assert.equal( ui.newPanel.length, 1 ); + assert.strictEqual( ui.newPanel[ 0 ], content[ 0 ] ); + state( assert, element, 0, 0, 0 ); }); element.accordion( "option", "active", 0 ); - state( element, 1, 0, 0 ); + state( assert, element, 1, 0, 0 ); element.one( "accordionbeforeactivate", function( event, ui ) { - equal( event.originalEvent.type, "click" ); - equal( ui.oldHeader.length, 1 ); - strictEqual( ui.oldHeader[ 0 ], headers[ 0 ] ); - equal( ui.oldPanel.length, 1 ); - strictEqual( ui.oldPanel[ 0 ], content[ 0 ] ); - equal( ui.newHeader.length, 1 ); - strictEqual( ui.newHeader[ 0 ], headers[ 1 ] ); - equal( ui.newPanel.length, 1 ); - strictEqual( ui.newPanel[ 0 ], content[ 1 ] ); - state( element, 1, 0, 0 ); + assert.equal( event.originalEvent.type, "click" ); + assert.equal( ui.oldHeader.length, 1 ); + assert.strictEqual( ui.oldHeader[ 0 ], headers[ 0 ] ); + assert.equal( ui.oldPanel.length, 1 ); + assert.strictEqual( ui.oldPanel[ 0 ], content[ 0 ] ); + assert.equal( ui.newHeader.length, 1 ); + assert.strictEqual( ui.newHeader[ 0 ], headers[ 1 ] ); + assert.equal( ui.newPanel.length, 1 ); + assert.strictEqual( ui.newPanel[ 0 ], content[ 1 ] ); + state( assert, element, 1, 0, 0 ); }); headers.eq( 1 ).trigger( "click" ); - state( element, 0, 1, 0 ); + state( assert, element, 0, 1, 0 ); element.one( "accordionbeforeactivate", function( event, ui ) { - ok( !( "originalEvent" in event ) ); - equal( ui.oldHeader.length, 1 ); - strictEqual( ui.oldHeader[ 0 ], headers[ 1 ] ); - equal( ui.oldPanel.length, 1 ); - strictEqual( ui.oldPanel[ 0 ], content[ 1 ] ); - equal( ui.newHeader.length, 0 ); - equal( ui.newPanel.length, 0 ); - state( element, 0, 1, 0 ); + assert.ok( !( "originalEvent" in event ) ); + assert.equal( ui.oldHeader.length, 1 ); + assert.strictEqual( ui.oldHeader[ 0 ], headers[ 1 ] ); + assert.equal( ui.oldPanel.length, 1 ); + assert.strictEqual( ui.oldPanel[ 0 ], content[ 1 ] ); + assert.equal( ui.newHeader.length, 0 ); + assert.equal( ui.newPanel.length, 0 ); + state( assert, element, 0, 1, 0 ); }); element.accordion( "option", "active", false ); - state( element, 0, 0, 0 ); + state( assert, element, 0, 0, 0 ); element.one( "accordionbeforeactivate", function( event, ui ) { - ok( !( "originalEvent" in event ) ); - equal( ui.oldHeader.length, 0 ); - equal( ui.oldPanel.length, 0 ); - equal( ui.newHeader.length, 1 ); - strictEqual( ui.newHeader[ 0 ], headers[ 2 ] ); - equal( ui.newPanel.length, 1 ); - strictEqual( ui.newPanel[ 0 ], content[ 2 ] ); + assert.ok( !( "originalEvent" in event ) ); + assert.equal( ui.oldHeader.length, 0 ); + assert.equal( ui.oldPanel.length, 0 ); + assert.equal( ui.newHeader.length, 1 ); + assert.strictEqual( ui.newHeader[ 0 ], headers[ 2 ] ); + assert.equal( ui.newPanel.length, 1 ); + assert.strictEqual( ui.newPanel[ 0 ], content[ 2 ] ); event.preventDefault(); - state( element, 0, 0, 0 ); + state( assert, element, 0, 0, 0 ); }); element.accordion( "option", "active", 2 ); - state( element, 0, 0, 0 ); + state( assert, element, 0, 0, 0 ); }); -test( "activate", function() { - expect( 21 ); +QUnit.test( "activate", function( assert ) { + assert.expect( 21 ); var element = $( "#list1" ).accordion({ active: false, collapsible: true @@ -123,44 +124,44 @@ test( "activate", function() { content = element.find( ".ui-accordion-content" ); element.one( "accordionactivate", function( event, ui ) { - equal( ui.oldHeader.length, 0 ); - equal( ui.oldPanel.length, 0 ); - equal( ui.newHeader.length, 1 ); - strictEqual( ui.newHeader[ 0 ], headers[ 0 ] ); - equal( ui.newPanel.length, 1 ); - strictEqual( ui.newPanel[ 0 ], content[ 0 ] ); + assert.equal( ui.oldHeader.length, 0 ); + assert.equal( ui.oldPanel.length, 0 ); + assert.equal( ui.newHeader.length, 1 ); + assert.strictEqual( ui.newHeader[ 0 ], headers[ 0 ] ); + assert.equal( ui.newPanel.length, 1 ); + assert.strictEqual( ui.newPanel[ 0 ], content[ 0 ] ); }); element.accordion( "option", "active", 0 ); element.one( "accordionactivate", function( event, ui ) { - equal( ui.oldHeader.length, 1 ); - strictEqual( ui.oldHeader[ 0 ], headers[ 0 ] ); - equal( ui.oldPanel.length, 1 ); - strictEqual( ui.oldPanel[ 0 ], content[ 0 ] ); - equal( ui.newHeader.length, 1 ); - strictEqual( ui.newHeader[ 0 ], headers[ 1 ] ); - equal( ui.newPanel.length, 1 ); - strictEqual( ui.newPanel[ 0 ], content[ 1 ] ); + assert.equal( ui.oldHeader.length, 1 ); + assert.strictEqual( ui.oldHeader[ 0 ], headers[ 0 ] ); + assert.equal( ui.oldPanel.length, 1 ); + assert.strictEqual( ui.oldPanel[ 0 ], content[ 0 ] ); + assert.equal( ui.newHeader.length, 1 ); + assert.strictEqual( ui.newHeader[ 0 ], headers[ 1 ] ); + assert.equal( ui.newPanel.length, 1 ); + assert.strictEqual( ui.newPanel[ 0 ], content[ 1 ] ); }); headers.eq( 1 ).trigger( "click" ); element.one( "accordionactivate", function( event, ui ) { - equal( ui.oldHeader.length, 1 ); - strictEqual( ui.oldHeader[ 0 ], headers[ 1 ] ); - equal( ui.oldPanel.length, 1 ); - strictEqual( ui.oldPanel[ 0 ], content[ 1 ] ); - equal( ui.newHeader.length, 0 ); - equal( ui.newPanel.length, 0 ); + assert.equal( ui.oldHeader.length, 1 ); + assert.strictEqual( ui.oldHeader[ 0 ], headers[ 1 ] ); + assert.equal( ui.oldPanel.length, 1 ); + assert.strictEqual( ui.oldPanel[ 0 ], content[ 1 ] ); + assert.equal( ui.newHeader.length, 0 ); + assert.equal( ui.newPanel.length, 0 ); }); element.accordion( "option", "active", false ); // prevent activation element.one( "accordionbeforeactivate", function( event ) { - ok( true ); + assert.ok( true ); event.preventDefault(); }); element.one( "accordionactivate", function() { - ok( false ); + assert.ok( false ); }); element.accordion( "option", "active", 1 ); }); diff --git a/tests/unit/accordion/helper.js b/tests/unit/accordion/helper.js index 5eb3a4bc3f2..faa24e840d0 100644 --- a/tests/unit/accordion/helper.js +++ b/tests/unit/accordion/helper.js @@ -1,13 +1,19 @@ define( [ + "intern!qunit", "jquery", "lib/helper", - "ui/accordion" -], function( $, helper ) { + "lib/css", + "text!tests/unit/accordion/accordion.html", + "ui/accordion", + "jquery-simulate", + "./common" +], function( QUnit, $, helper, cssjs, htmlContent ) { +cssjs( { module: "core accordion" } ); return $.extend( helper, { - equalHeight: function( accordion, height ) { + equalHeight: function( assert, accordion, height ) { accordion.find( ".ui-accordion-content" ).each(function() { - equal( $( this ).outerHeight(), height ); + assert.equal( $( this ).outerHeight(), height ); }); }, @@ -15,20 +21,22 @@ return $.extend( helper, { var animate = $.ui.accordion.prototype.options.animate; return { setup: function() { + $("body").append(htmlContent); $.ui.accordion.prototype.options.animate = false; }, teardown: function() { + $("#qunit-fixture").remove(); $.ui.accordion.prototype.options.animate = animate; } }; }, - state: function( accordion ) { - var expected = $.makeArray( arguments ).slice( 1 ), + state: function( assert, accordion ) { + var expected = $.makeArray( arguments ).slice( 2 ), actual = accordion.find( ".ui-accordion-content" ).map(function() { return $( this ).css( "display" ) === "none" ? 0 : 1; }).get(); - QUnit.push( QUnit.equiv(actual, expected), actual, expected ); + assert.deepEqual(actual, expected, "State Assert") } } ); diff --git a/tests/unit/accordion/methods.js b/tests/unit/accordion/methods.js index efabfed10b1..5c1c66ba624 100644 --- a/tests/unit/accordion/methods.js +++ b/tests/unit/accordion/methods.js @@ -1,46 +1,47 @@ define( [ + "lib/qunit", "jquery", "./helper", "ui/accordion" -], function( $, testHelper ) { +], function( QUnit, $, testHelper ) { var equalHeight = testHelper.equalHeight, setupTeardown = testHelper.setupTeardown, state = testHelper.state; -module( "accordion: methods", setupTeardown() ); +QUnit.module( "accordion: methods", setupTeardown() ); -test( "destroy", function( assert ) { - expect( 1 ); +QUnit.test( "destroy", function( assert ) { + assert.expect( 1 ); assert.domEqual( "#list1", function() { $( "#list1" ).accordion().accordion( "destroy" ); }); }); -test( "enable/disable", function( assert ) { - expect( 7 ); +QUnit.test( "enable/disable", function( assert ) { + assert.expect( 7 ); var element = $( "#list1" ).accordion(); - state( element, 1, 0, 0 ); + state( assert, element, 1, 0, 0 ); element.accordion( "disable" ); assert.hasClasses( element, "ui-state-disabled" ); - equal( element.attr( "aria-disabled" ), "true", "element gets aria-disabled" ); + assert.equal( element.attr( "aria-disabled" ), "true", "element gets aria-disabled" ); assert.hasClasses( element, "ui-accordion-disabled" ); // event does nothing element.find( ".ui-accordion-header" ).eq( 1 ).trigger( "click" ); - state( element, 1, 0, 0 ); + state( assert, element, 1, 0, 0 ); // option still works element.accordion( "option", "active", 1 ); - state( element, 0, 1, 0 ); + state( assert, element, 0, 1, 0 ); element.accordion( "enable" ); element.accordion( "option", "active", 2 ); - state( element, 0, 0, 1 ); + state( assert, element, 0, 0, 1 ); }); -test( "refresh", function() { - expect( 19 ); +QUnit.test( "refresh", function( assert ) { + assert.expect( 19 ); var element = $( "#navigation" ) .parent() .height( 300 ) @@ -48,37 +49,37 @@ test( "refresh", function() { .accordion({ heightStyle: "fill" }); - equalHeight( element, 255 ); + equalHeight( assert, element, 255 ); element.parent().height( 500 ); element.accordion( "refresh" ); - equalHeight( element, 455 ); + equalHeight( assert, element, 455 ); element = $( "#list1" ); element.accordion(); - state( element, 1, 0, 0 ); + state( assert, element, 1, 0, 0 ); // disable panel via markup element.find( "h3.bar" ).eq( 1 ).addClass( "ui-state-disabled" ); element.accordion( "refresh" ); - state( element, 1, 0, 0 ); + state( assert, element, 1, 0, 0 ); // don't add multiple icons element.accordion( "refresh" ); - equal( element.find( ".ui-accordion-header-icon" ).length, 3 ); + assert.equal( element.find( ".ui-accordion-header-icon" ).length, 3 ); // add a panel element .append("

new 1

") .append(""); element.accordion( "refresh" ); - state( element, 1, 0, 0, 0 ); + state( assert, element, 1, 0, 0, 0 ); // remove all tabs element.find( "h3.bar, div.foo" ).remove(); element.accordion( "refresh" ); - state( element ); - equal( element.accordion( "option", "active" ), false, "no active accordion panel" ); + state( assert, element ); + assert.equal( element.accordion( "option", "active" ), false, "no active accordion panel" ); // add panels element @@ -91,46 +92,46 @@ test( "refresh", function() { .append("

new 5

") .append(""); element.accordion( "refresh" ); - state( element, 1, 0, 0, 0 ); + state( assert, element, 1, 0, 0, 0 ); // activate third tab element.accordion( "option", "active", 2 ); - state( element, 0, 0, 1, 0 ); + state( assert, element, 0, 0, 1, 0 ); // remove fourth panel, third panel should stay active element.find( "h3.bar" ).eq( 3 ).remove(); element.find( "div.foo" ).eq( 3 ).remove(); element.accordion( "refresh" ); - state( element, 0, 0, 1 ); + state( assert, element, 0, 0, 1 ); // remove third (active) panel, second panel should become active element.find( "h3.bar" ).eq( 2 ).remove(); element.find( "div.foo" ).eq( 2 ).remove(); element.accordion( "refresh" ); - state( element, 0, 1 ); + state( assert, element, 0, 1 ); // remove first panel, previously active panel (now first) should stay active element.find( "h3.bar" ).eq( 0 ).remove(); element.find( "div.foo" ).eq( 0 ).remove(); element.accordion( "refresh" ); - state( element, 1 ); + state( assert, element, 1 ); // collapse all panels element.accordion( "option", { collapsible: true, active: false }); - state( element, 0 ); + state( assert, element, 0 ); element.accordion( "refresh" ); - state( element, 0 ); + state( assert, element, 0 ); }); -test( "widget", function() { - expect( 2 ); +QUnit.test( "widget", function( assert ) { + assert.expect( 2 ); var element = $( "#list1" ).accordion(), widgetElement = element.accordion( "widget" ); - equal( widgetElement.length, 1, "one element" ); - strictEqual( widgetElement[ 0 ], element[ 0 ], "same element" ); + assert.equal( widgetElement.length, 1, "one element" ); + assert.strictEqual( widgetElement[ 0 ], element[ 0 ], "same element" ); }); } ); diff --git a/tests/unit/accordion/options.js b/tests/unit/accordion/options.js index 52d54ed32e4..af1a3206e5a 100644 --- a/tests/unit/accordion/options.js +++ b/tests/unit/accordion/options.js @@ -1,115 +1,116 @@ define( [ + "lib/qunit", "jquery", "./helper", "ui/accordion" -], function( $, testHelper ) { +], function( QUnit, $, testHelper ) { var equalHeight = testHelper.equalHeight, setupTeardown = testHelper.setupTeardown, state = testHelper.state; -module( "accordion: options", setupTeardown() ); +QUnit.module( "accordion: options", setupTeardown() ); -test( "{ active: default }", function() { - expect( 2 ); +QUnit.test( "{ active: default }", function( assert ) { + assert.expect( 2 ); var element = $( "#list1" ).accordion(); - equal( element.accordion( "option", "active" ), 0 ); - state( element, 1, 0, 0 ); + assert.equal( element.accordion( "option", "active" ), 0 ); + state( assert, element, 1, 0, 0 ); }); -test( "{ active: null }", function() { - expect( 2 ); +QUnit.test( "{ active: null }", function( assert ) { + assert.expect( 2 ); var element = $( "#list1" ).accordion({ active: null }); - equal( element.accordion( "option", "active" ), 0 ); - state( element, 1, 0, 0 ); + assert.equal( element.accordion( "option", "active" ), 0 ); + state( assert, element, 1, 0, 0 ); }); -test( "{ active: false }", function() { - expect( 7 ); +QUnit.test( "{ active: false }", function( assert ) { + assert.expect( 7 ); var element = $( "#list1" ).accordion({ active: false, collapsible: true }); - state( element, 0, 0, 0 ); - equal( element.find( ".ui-accordion-header.ui-state-active" ).length, 0, "no headers selected" ); - equal( element.accordion( "option", "active" ), false ); + state( assert, element, 0, 0, 0 ); + assert.equal( element.find( ".ui-accordion-header.ui-state-active" ).length, 0, "no headers selected" ); + assert.equal( element.accordion( "option", "active" ), false ); element.accordion( "option", "collapsible", false ); - state( element, 1, 0, 0 ); - equal( element.accordion( "option", "active" ), 0 ); + state( assert, element, 1, 0, 0 ); + assert.equal( element.accordion( "option", "active" ), 0 ); element.accordion( "destroy" ); element.accordion({ active: false }); - state( element, 1, 0, 0 ); - strictEqual( element.accordion( "option", "active" ), 0 ); + state( assert, element, 1, 0, 0 ); + assert.strictEqual( element.accordion( "option", "active" ), 0 ); }); -test( "{ active: Number }", function() { - expect( 8 ); +QUnit.test( "{ active: Number }", function( assert ) { + assert.expect( 8 ); var element = $( "#list1" ).accordion({ active: 2 }); - equal( element.accordion( "option", "active" ), 2 ); - state( element, 0, 0, 1 ); + assert.equal( element.accordion( "option", "active" ), 2 ); + state( assert, element, 0, 0, 1 ); element.accordion( "option", "active", 0 ); - equal( element.accordion( "option", "active" ), 0 ); - state( element, 1, 0, 0 ); + assert.equal( element.accordion( "option", "active" ), 0 ); + state( assert, element, 1, 0, 0 ); element.find( ".ui-accordion-header" ).eq( 1 ).trigger( "click" ); - equal( element.accordion( "option", "active" ), 1 ); - state( element, 0, 1, 0 ); + assert.equal( element.accordion( "option", "active" ), 1 ); + state( assert, element, 0, 1, 0 ); element.accordion( "option", "active", 10 ); - equal( element.accordion( "option", "active" ), 1 ); - state( element, 0, 1, 0 ); + assert.equal( element.accordion( "option", "active" ), 1 ); + state( assert, element, 0, 1, 0 ); }); -test( "{ active: -Number }", function() { - expect( 8 ); +QUnit.test( "{ active: -Number }", function( assert ) { + assert.expect( 8 ); var element = $( "#list1" ).accordion({ active: -1 }); - equal( element.accordion( "option", "active" ), 2 ); - state( element, 0, 0, 1 ); + assert.equal( element.accordion( "option", "active" ), 2 ); + state( assert, element, 0, 0, 1 ); element.accordion( "option", "active", -2 ); - equal( element.accordion( "option", "active" ), 1 ); - state( element, 0, 1, 0 ); + assert.equal( element.accordion( "option", "active" ), 1 ); + state( assert, element, 0, 1, 0 ); element.accordion( "option", "active", -10 ); - equal( element.accordion( "option", "active" ), 1 ); - state( element, 0, 1, 0 ); + assert.equal( element.accordion( "option", "active" ), 1 ); + state( assert, element, 0, 1, 0 ); element.accordion( "option", "active", -3 ); - equal( element.accordion( "option", "active" ), 0 ); - state( element, 1, 0, 0 ); + assert.equal( element.accordion( "option", "active" ), 0 ); + state( assert, element, 1, 0, 0 ); }); -test( "{ animate: false }", function() { - expect( 3 ); +QUnit.test( "{ animate: false }", function( assert ) { + assert.expect( 3 ); var element = $( "#list1" ).accordion({ animate: false }), panels = element.find( ".ui-accordion-content" ), animate = $.fn.animate; $.fn.animate = function() { - ok( false, ".animate() called" ); + assert.ok( false, ".animate() called" ); }; - ok( panels.eq( 0 ).is( ":visible" ), "first panel visible" ); + assert.ok( panels.eq( 0 ).is( ":visible" ), "first panel visible" ); element.accordion( "option", "active", 1 ); - ok( panels.eq( 0 ).is( ":hidden" ), "first panel hidden" ); - ok( panels.eq( 1 ).is( ":visible" ), "second panel visible" ); + assert.ok( panels.eq( 0 ).is( ":hidden" ), "first panel hidden" ); + assert.ok( panels.eq( 1 ).is( ":visible" ), "second panel visible" ); $.fn.animate = animate; }); -asyncTest( "{ animate: Number }", function() { - expect( 7 ); +QUnit.asyncTest( "{ animate: Number }", function( assert ) { + assert.expect( 7 ); var element = $( "#list1" ).accordion({ animate: 100 }), @@ -117,23 +118,23 @@ asyncTest( "{ animate: Number }", function() { animate = $.fn.animate; // called twice (both panels) $.fn.animate = function( props, options ) { - equal( options.duration, 100, "correct duration" ); - equal( options.easing, undefined, "default easing" ); + assert.equal( options.duration, 100, "correct duration" ); + assert.equal( options.easing, undefined, "default easing" ); animate.apply( this, arguments ); }; - ok( panels.eq( 0 ).is( ":visible" ), "first panel visible" ); + assert.ok( panels.eq( 0 ).is( ":visible" ), "first panel visible" ); element.accordion( "option", "active", 1 ); panels.promise().done(function() { - ok( panels.eq( 0 ).is( ":hidden" ), "first panel hidden" ); - ok( panels.eq( 1 ).is( ":visible" ), "second panel visible" ); + assert.ok( panels.eq( 0 ).is( ":hidden" ), "first panel hidden" ); + assert.ok( panels.eq( 1 ).is( ":visible" ), "second panel visible" ); $.fn.animate = animate; - start(); + QUnit.start(); }); }); -asyncTest( "{ animate: String }", function() { - expect( 7 ); +QUnit.asyncTest( "{ animate: String }", function( assert ) { + assert.expect( 7 ); var element = $( "#list1" ).accordion({ animate: "linear" }), @@ -141,23 +142,23 @@ asyncTest( "{ animate: String }", function() { animate = $.fn.animate; // called twice (both panels) $.fn.animate = function( props, options ) { - equal( options.duration, undefined, "default duration" ); - equal( options.easing, "linear", "correct easing" ); + assert.equal( options.duration, undefined, "default duration" ); + assert.equal( options.easing, "linear", "correct easing" ); animate.apply( this, arguments ); }; - ok( panels.eq( 0 ).is( ":visible" ), "first panel visible" ); + assert.ok( panels.eq( 0 ).is( ":visible" ), "first panel visible" ); element.accordion( "option", "active", 1 ); panels.promise().done(function() { - ok( panels.eq( 0 ).is( ":hidden" ), "first panel hidden" ); - ok( panels.eq( 1 ).is( ":visible" ), "second panel visible" ); + assert.ok( panels.eq( 0 ).is( ":hidden" ), "first panel hidden" ); + assert.ok( panels.eq( 1 ).is( ":visible" ), "second panel visible" ); $.fn.animate = animate; - start(); + QUnit.start(); }); }); -asyncTest( "{ animate: {} }", function() { - expect( 7 ); +QUnit.asyncTest( "{ animate: {} }", function( assert ) { + assert.expect( 7 ); var element = $( "#list1" ).accordion({ animate: {} }), @@ -165,23 +166,23 @@ asyncTest( "{ animate: {} }", function() { animate = $.fn.animate; // called twice (both panels) $.fn.animate = function( props, options ) { - equal( options.duration, undefined, "default duration" ); - equal( options.easing, undefined, "default easing" ); + assert.equal( options.duration, undefined, "default duration" ); + assert.equal( options.easing, undefined, "default easing" ); animate.apply( this, arguments ); }; - ok( panels.eq( 0 ).is( ":visible" ), "first panel visible" ); + assert.ok( panels.eq( 0 ).is( ":visible" ), "first panel visible" ); element.accordion( "option", "active", 1 ); panels.promise().done(function() { - ok( panels.eq( 0 ).is( ":hidden" ), "first panel hidden" ); - ok( panels.eq( 1 ).is( ":visible" ), "second panel visible" ); + assert.ok( panels.eq( 0 ).is( ":hidden" ), "first panel hidden" ); + assert.ok( panels.eq( 1 ).is( ":visible" ), "second panel visible" ); $.fn.animate = animate; - start(); + QUnit.start(); }); }); -asyncTest( "{ animate: { duration, easing } }", function() { - expect( 7 ); +QUnit.asyncTest( "{ animate: { duration, easing } }", function( assert ) { + assert.expect( 7 ); var element = $( "#list1" ).accordion({ animate: { duration: 100, easing: "linear" } }), @@ -189,23 +190,23 @@ asyncTest( "{ animate: { duration, easing } }", function() { animate = $.fn.animate; // called twice (both panels) $.fn.animate = function( props, options ) { - equal( options.duration, 100, "correct duration" ); - equal( options.easing, "linear", "correct easing" ); + assert.equal( options.duration, 100, "correct duration" ); + assert.equal( options.easing, "linear", "correct easing" ); animate.apply( this, arguments ); }; - ok( panels.eq( 0 ).is( ":visible" ), "first panel visible" ); + assert.ok( panels.eq( 0 ).is( ":visible" ), "first panel visible" ); element.accordion( "option", "active", 1 ); panels.promise().done(function() { - ok( panels.eq( 0 ).is( ":hidden" ), "first panel hidden" ); - ok( panels.eq( 1 ).is( ":visible" ), "second panel visible" ); + assert.ok( panels.eq( 0 ).is( ":hidden" ), "first panel hidden" ); + assert.ok( panels.eq( 1 ).is( ":visible" ), "second panel visible" ); $.fn.animate = animate; - start(); + QUnit.start(); }); }); -asyncTest( "{ animate: { duration, easing } }, animate down", function() { - expect( 7 ); +QUnit.asyncTest( "{ animate: { duration, easing } }, animate down", function( assert ) { + assert.expect( 7 ); var element = $( "#list1" ).accordion({ active: 1, animate: { duration: 100, easing: "linear" } @@ -214,23 +215,23 @@ asyncTest( "{ animate: { duration, easing } }, animate down", function() { animate = $.fn.animate; // called twice (both panels) $.fn.animate = function( props, options ) { - equal( options.duration, 100, "correct duration" ); - equal( options.easing, "linear", "correct easing" ); + assert.equal( options.duration, 100, "correct duration" ); + assert.equal( options.easing, "linear", "correct easing" ); animate.apply( this, arguments ); }; - ok( panels.eq( 1 ).is( ":visible" ), "first panel visible" ); + assert.ok( panels.eq( 1 ).is( ":visible" ), "first panel visible" ); element.accordion( "option", "active", 0 ); panels.promise().done(function() { - ok( panels.eq( 1 ).is( ":hidden" ), "first panel hidden" ); - ok( panels.eq( 0 ).is( ":visible" ), "second panel visible" ); + assert.ok( panels.eq( 1 ).is( ":hidden" ), "first panel hidden" ); + assert.ok( panels.eq( 0 ).is( ":visible" ), "second panel visible" ); $.fn.animate = animate; - start(); + QUnit.start(); }); }); -asyncTest( "{ animate: { duration, easing, down } }, animate down", function() { - expect( 7 ); +QUnit.asyncTest( "{ animate: { duration, easing, down } }, animate down", function( assert ) { + assert.expect( 7 ); var element = $( "#list1" ).accordion({ active: 1, animate: { @@ -245,154 +246,154 @@ asyncTest( "{ animate: { duration, easing, down } }, animate down", function() { animate = $.fn.animate; // called twice (both panels) $.fn.animate = function( props, options ) { - equal( options.duration, 100, "correct duration" ); - equal( options.easing, "swing", "correct easing" ); + assert.equal( options.duration, 100, "correct duration" ); + assert.equal( options.easing, "swing", "correct easing" ); animate.apply( this, arguments ); }; - ok( panels.eq( 1 ).is( ":visible" ), "first panel visible" ); + assert.ok( panels.eq( 1 ).is( ":visible" ), "first panel visible" ); element.accordion( "option", "active", 0 ); panels.promise().done(function() { - ok( panels.eq( 1 ).is( ":hidden" ), "first panel hidden" ); - ok( panels.eq( 0 ).is( ":visible" ), "second panel visible" ); + assert.ok( panels.eq( 1 ).is( ":hidden" ), "first panel hidden" ); + assert.ok( panels.eq( 0 ).is( ":visible" ), "second panel visible" ); $.fn.animate = animate; - start(); + QUnit.start(); }); }); -test( "{ collapsible: false }", function() { - expect( 4 ); +QUnit.test( "{ collapsible: false }", function( assert ) { + assert.expect( 4 ); var element = $( "#list1" ).accordion({ active: 1 }); element.accordion( "option", "active", false ); - equal( element.accordion( "option", "active" ), 1 ); - state( element, 0, 1, 0 ); + assert.equal( element.accordion( "option", "active" ), 1 ); + state( assert, element, 0, 1, 0 ); element.find( ".ui-accordion-header" ).eq( 1 ).trigger( "click" ); - equal( element.accordion( "option", "active" ), 1 ); - state( element, 0, 1, 0 ); + assert.equal( element.accordion( "option", "active" ), 1 ); + state( assert, element, 0, 1, 0 ); }); -test( "{ collapsible: true }", function() { - expect( 6 ); +QUnit.test( "{ collapsible: true }", function( assert ) { + assert.expect( 6 ); var element = $( "#list1" ).accordion({ active: 1, collapsible: true }); element.accordion( "option", "active", false ); - equal( element.accordion( "option", "active" ), false ); - state( element, 0, 0, 0 ); + assert.equal( element.accordion( "option", "active" ), false ); + state( assert, element, 0, 0, 0 ); element.accordion( "option", "active", 1 ); - equal( element.accordion( "option", "active" ), 1 ); - state( element, 0, 1, 0 ); + assert.equal( element.accordion( "option", "active" ), 1 ); + state( assert, element, 0, 1, 0 ); element.find( ".ui-accordion-header" ).eq( 1 ).trigger( "click" ); - equal( element.accordion( "option", "active" ), false ); - state( element, 0, 0, 0 ); + assert.equal( element.accordion( "option", "active" ), false ); + state( assert, element, 0, 0, 0 ); }); -test( "{ event: null }", function() { - expect( 5 ); +QUnit.test( "{ event: null }", function( assert ) { + assert.expect( 5 ); var element = $( "#list1" ).accordion({ event: null }); - state( element, 1, 0, 0 ); + state( assert, element, 1, 0, 0 ); element.accordion( "option", "active", 1 ); - equal( element.accordion( "option", "active" ), 1 ); - state( element, 0, 1, 0 ); + assert.equal( element.accordion( "option", "active" ), 1 ); + state( assert, element, 0, 1, 0 ); // ensure default click handler isn't bound element.find( ".ui-accordion-header" ).eq( 2 ).trigger( "click" ); - equal( element.accordion( "option", "active" ), 1 ); - state( element, 0, 1, 0 ); + assert.equal( element.accordion( "option", "active" ), 1 ); + state( assert, element, 0, 1, 0 ); }); -test( "{ event: custom }", function() { - expect( 11 ); +QUnit.test( "{ event: custom }", function( assert ) { + assert.expect( 11 ); var element = $( "#list1" ).accordion({ event: "custom1 custom2" }); - state( element, 1, 0, 0 ); + state( assert, element, 1, 0, 0 ); element.find( ".ui-accordion-header" ).eq( 1 ).trigger( "custom1" ); - equal( element.accordion( "option", "active" ), 1 ); - state( element, 0, 1, 0 ); + assert.equal( element.accordion( "option", "active" ), 1 ); + state( assert, element, 0, 1, 0 ); // ensure default click handler isn't bound element.find( ".ui-accordion-header" ).eq( 2 ).trigger( "click" ); - equal( element.accordion( "option", "active" ), 1 ); - state( element, 0, 1, 0 ); + assert.equal( element.accordion( "option", "active" ), 1 ); + state( assert, element, 0, 1, 0 ); element.find( ".ui-accordion-header" ).eq( 2 ).trigger( "custom2" ); - equal( element.accordion( "option", "active" ), 2 ); - state( element, 0, 0, 1 ); + assert.equal( element.accordion( "option", "active" ), 2 ); + state( assert, element, 0, 0, 1 ); element.accordion( "option", "event", "custom3" ); // ensure old event handlers are unbound element.find( ".ui-accordion-header" ).eq( 1 ).trigger( "custom1" ); element.find( ".ui-accordion-header" ).eq( 1 ).trigger( "custom2" ); - equal( element.accordion( "option", "active" ), 2 ); - state( element, 0, 0, 1 ); + assert.equal( element.accordion( "option", "active" ), 2 ); + state( assert, element, 0, 0, 1 ); element.find( ".ui-accordion-header" ).eq( 1 ).trigger( "custom3" ); - equal( element.accordion( "option", "active" ), 1 ); - state( element, 0, 1, 0 ); + assert.equal( element.accordion( "option", "active" ), 1 ); + state( assert, element, 0, 1, 0 ); }); -test( "{ header: default }", function() { - expect( 2 ); +QUnit.test( "{ header: default }", function( assert ) { + assert.expect( 2 ); // default: > li > :first-child,> :not(li):even // > :not(li):even - state( $( "#list1" ).accordion(), 1, 0, 0); + state( assert, $( "#list1" ).accordion(), 1, 0, 0); // > li > :first-child - state( $( "#navigation" ).accordion(), 1, 0, 0); + state( assert, $( "#navigation" ).accordion(), 1, 0, 0); }); -test( "{ header: custom }", function( assert ) { - expect( 6 ); +QUnit.test( "{ header: custom }", function( assert ) { + assert.expect( 6 ); var element = $( "#navigationWrapper" ).accordion({ header: "h2" }); element.find( "h2" ).each(function() { assert.hasClasses( this, "ui-accordion-header" ); }); - equal( element.find( ".ui-accordion-header" ).length, 3 ); - state( element, 1, 0, 0 ); + assert.equal( element.find( ".ui-accordion-header" ).length, 3 ); + state( assert, element, 1, 0, 0 ); element.accordion( "option", "active", 2 ); - state( element, 0, 0, 1 ); + state( assert, element, 0, 0, 1 ); }); -test( "{ heightStyle: 'auto' }", function() { - expect( 3 ); +QUnit.test( "{ heightStyle: 'auto' }", function( assert ) { + assert.expect( 3 ); var element = $( "#navigation" ).accordion({ heightStyle: "auto" }); - equalHeight( element, 105 ); + equalHeight( assert, element, 105 ); }); -test( "{ heightStyle: 'content' }", function() { - expect( 3 ); +QUnit.test( "{ heightStyle: 'content' }", function( assert ) { + assert.expect( 3 ); var element = $( "#navigation" ).accordion({ heightStyle: "content" }), sizes = element.find( ".ui-accordion-content" ).map(function() { return $( this ).height(); }).get(); - equal( sizes[ 0 ], 75 ); - equal( sizes[ 1 ], 105 ); - equal( sizes[ 2 ], 45 ); + assert.equal( sizes[ 0 ], 75 ); + assert.equal( sizes[ 1 ], 105 ); + assert.equal( sizes[ 2 ], 45 ); }); -test( "{ heightStyle: 'fill' }", function() { - expect( 3 ); +QUnit.test( "{ heightStyle: 'fill' }", function( assert ) { + assert.expect( 3 ); $( "#navigationWrapper" ).height( 500 ); var element = $( "#navigation" ).accordion({ heightStyle: "fill" }); - equalHeight( element, 455 ); + equalHeight( assert, element, 455 ); }); -test( "{ heightStyle: 'fill' } with sibling", function() { - expect( 3 ); +QUnit.test( "{ heightStyle: 'fill' } with sibling", function( assert ) { + assert.expect( 3 ); $( "#navigationWrapper" ).height( 500 ); $( "

Lorem Ipsum

" ) .css({ @@ -402,11 +403,11 @@ test( "{ heightStyle: 'fill' } with sibling", function() { }) .prependTo( "#navigationWrapper" ); var element = $( "#navigation" ).accordion({ heightStyle: "fill" }); - equalHeight( element , 355 ); + equalHeight( assert, element , 355 ); }); -test( "{ heightStyle: 'fill' } with multiple siblings", function() { - expect( 3 ); +QUnit.test( "{ heightStyle: 'fill' } with multiple siblings", function( assert ) { + assert.expect( 3 ); $( "#navigationWrapper" ).height( 500 ); $( "

Lorem Ipsum

" ) .css({ @@ -431,15 +432,15 @@ test( "{ heightStyle: 'fill' } with multiple siblings", function() { }) .prependTo( "#navigationWrapper" ); var element = $( "#navigation" ).accordion({ heightStyle: "fill" }); - equalHeight( element, 305 ); + equalHeight( assert, element, 305 ); }); -test( "{ icons: false }", function() { - expect( 8 ); +QUnit.test( "{ icons: false }", function( assert ) { + assert.expect( 8 ); var element = $( "#list1" ); function icons( on ) { - deepEqual( element.find( "span.ui-icon").length, on ? 3 : 0 ); - deepEqual( element.find( ".ui-accordion-header.ui-accordion-icons" ).length, on ? 3 : 0 ); + assert.deepEqual( element.find( "span.ui-icon").length, on ? 3 : 0 ); + assert.deepEqual( element.find( ".ui-accordion-header.ui-accordion-icons" ).length, on ? 3 : 0 ); } element.accordion(); icons( true ); @@ -453,8 +454,8 @@ test( "{ icons: false }", function() { icons( false ); }); -test( "{ icons: hash }", function( assert ) { - expect( 3 ); +QUnit.test( "{ icons: hash }", function( assert ) { + assert.expect( 3 ); var element = $( "#list1" ).accordion({ icons: { activeHeader: "a1", header: "h1" } }); diff --git a/tests/unit/all.js b/tests/unit/all.js new file mode 100644 index 00000000000..f9a1860c73b --- /dev/null +++ b/tests/unit/all.js @@ -0,0 +1,10 @@ +define([ + "tests/unit/accordion/core", + "tests/unit/accordion/events", + "tests/unit/accordion/methods", + "tests/unit/accordion/options", + "tests/unit/autocomplete/core", + "tests/unit/autocomplete/events", + "tests/unit/autocomplete/methods", + "tests/unit/autocomplete/options", +]); diff --git a/tests/unit/autocomplete/autocomplete.html b/tests/unit/autocomplete/autocomplete.html index 484f2d95758..def2fc06902 100644 --- a/tests/unit/autocomplete/autocomplete.html +++ b/tests/unit/autocomplete/autocomplete.html @@ -1,16 +1,3 @@ - - - - - - - - - - - - - - - diff --git a/tests/unit/autocomplete/core.js b/tests/unit/autocomplete/core.js index 184bcdbf423..3e812d7023e 100644 --- a/tests/unit/autocomplete/core.js +++ b/tests/unit/autocomplete/core.js @@ -1,12 +1,14 @@ -define( [ +define([ 'qunit', 'qunit', "jquery", + "./helper", "ui/autocomplete" -], function( $ ) { +], function( QUnit, QUnit, $ , testHelper) { -module( "autocomplete: core" ); +var setupTeardown = testHelper.setupTeardown; +QUnit.module( "autocomplete: core", setupTeardown() ); -test( "markup structure", function( assert ) { - expect( 2 ); +QUnit.test( "markup structure", function( assert ) { + assert.expect( 2 ); var element = $( "#autocomplete" ).autocomplete(), menu = element.autocomplete( "widget" ); @@ -14,8 +16,8 @@ test( "markup structure", function( assert ) { assert.hasClasses( menu, "ui-autocomplete ui-widget ui-widget-content" ); }); -test( "prevent form submit on enter when menu is active", function() { - expect( 2 ); +QUnit.test( "prevent form submit on enter when menu is active", function( assert ) { + assert.expect( 2 ); var event, element = $( "#autocomplete" ) .autocomplete({ @@ -28,17 +30,17 @@ test( "prevent form submit on enter when menu is active", function() { event = $.Event( "keydown" ); event.keyCode = $.ui.keyCode.DOWN; element.trigger( event ); - equal( menu.find( ".ui-menu-item-wrapper.ui-state-active" ).length, 1, + assert.equal( menu.find( ".ui-menu-item-wrapper.ui-state-active" ).length, 1, "menu item is active" ); event = $.Event( "keydown" ); event.keyCode = $.ui.keyCode.ENTER; element.trigger( event ); - ok( event.isDefaultPrevented(), "default action is prevented" ); + assert.ok( event.isDefaultPrevented(), "default action is prevented" ); }); -test( "allow form submit on enter when menu is not active", function() { - expect( 1 ); +QUnit.test( "allow form submit on enter when menu is not active", function( assert ) { + assert.expect( 1 ); var event, element = $( "#autocomplete" ) .autocomplete({ @@ -51,84 +53,84 @@ test( "allow form submit on enter when menu is not active", function() { event = $.Event( "keydown" ); event.keyCode = $.ui.keyCode.ENTER; element.trigger( event ); - ok( !event.isDefaultPrevented(), "default action is prevented" ); + assert.ok( !event.isDefaultPrevented(), "default action is prevented" ); }); (function() { - test( "up arrow invokes search - input", function() { - arrowsInvokeSearch( "#autocomplete", true, true ); + QUnit.test( "up arrow invokes search - input", function( assert ) { + arrowsInvokeSearch( assert, "#autocomplete", true, true ); }); - test( "down arrow invokes search - input", function() { - arrowsInvokeSearch( "#autocomplete", false, true ); + QUnit.test( "down arrow invokes search - input", function( assert ) { + arrowsInvokeSearch( assert, "#autocomplete", false, true ); }); - test( "up arrow invokes search - textarea", function() { - arrowsInvokeSearch( "#autocomplete-textarea", true, false ); + QUnit.test( "up arrow invokes search - textarea", function( assert ) { + arrowsInvokeSearch( assert, "#autocomplete-textarea", true, false ); }); - test( "down arrow invokes search - textarea", function() { - arrowsInvokeSearch( "#autocomplete-textarea", false, false ); + QUnit.test( "down arrow invokes search - textarea", function( assert ) { + arrowsInvokeSearch( assert, "#autocomplete-textarea", false, false ); }); - test( "up arrow invokes search - contenteditable", function() { - arrowsInvokeSearch( "#autocomplete-contenteditable", true, false ); + QUnit.test( "up arrow invokes search - contenteditable", function( assert ) { + arrowsInvokeSearch( assert, "#autocomplete-contenteditable", true, false ); }); - test( "down arrow invokes search - contenteditable", function() { - arrowsInvokeSearch( "#autocomplete-contenteditable", false, false ); + QUnit.test( "down arrow invokes search - contenteditable", function( assert ) { + arrowsInvokeSearch( assert, "#autocomplete-contenteditable", false, false ); }); - test( "up arrow moves focus - input", function() { - arrowsMoveFocus( "#autocomplete", true ); + QUnit.test( "up arrow moves focus - input", function( assert ) { + arrowsMoveFocus( assert, "#autocomplete", true ); }); - test( "down arrow moves focus - input", function() { - arrowsMoveFocus( "#autocomplete", false ); + QUnit.test( "down arrow moves focus - input", function( assert ) { + arrowsMoveFocus( assert, "#autocomplete", false ); }); - test( "up arrow moves focus - textarea", function() { - arrowsMoveFocus( "#autocomplete-textarea", true ); + QUnit.test( "up arrow moves focus - textarea", function( assert ) { + arrowsMoveFocus( assert, "#autocomplete-textarea", true ); }); - test( "down arrow moves focus - textarea", function() { - arrowsMoveFocus( "#autocomplete-textarea", false ); + QUnit.test( "down arrow moves focus - textarea", function( assert ) { + arrowsMoveFocus( assert, "#autocomplete-textarea", false ); }); - test( "up arrow moves focus - contenteditable", function() { - arrowsMoveFocus( "#autocomplete-contenteditable", true ); + QUnit.test( "up arrow moves focus - contenteditable", function( assert ) { + arrowsMoveFocus( assert, "#autocomplete-contenteditable", true ); }); - test( "down arrow moves focus - contenteditable", function() { - arrowsMoveFocus( "#autocomplete-contenteditable", false ); + QUnit.test( "down arrow moves focus - contenteditable", function( assert ) { + arrowsMoveFocus( assert, "#autocomplete-contenteditable", false ); }); - test( "up arrow moves cursor - input", function() { - arrowsNavigateElement( "#autocomplete", true, false ); + QUnit.test( "up arrow moves cursor - input", function( assert ) { + arrowsNavigateElement( assert, "#autocomplete", true, false ); }); - test( "down arrow moves cursor - input", function() { - arrowsNavigateElement( "#autocomplete", false, false ); + QUnit.test( "down arrow moves cursor - input", function( assert ) { + arrowsNavigateElement( assert, "#autocomplete", false, false ); }); - test( "up arrow moves cursor - textarea", function() { - arrowsNavigateElement( "#autocomplete-textarea", true, true ); + QUnit.test( "up arrow moves cursor - textarea", function( assert ) { + arrowsNavigateElement( assert, "#autocomplete-textarea", true, true ); }); - test( "down arrow moves cursor - textarea", function() { - arrowsNavigateElement( "#autocomplete-textarea", false, true ); + QUnit.test( "down arrow moves cursor - textarea", function( assert ) { + arrowsNavigateElement( assert, "#autocomplete-textarea", false, true ); }); - test( "up arrow moves cursor - contenteditable", function() { - arrowsNavigateElement( "#autocomplete-contenteditable", true, true ); + QUnit.test( "up arrow moves cursor - contenteditable", function( assert ) { + arrowsNavigateElement( assert, "#autocomplete-contenteditable", true, true ); }); - test( "down arrow moves cursor - contenteditable", function() { - arrowsNavigateElement( "#autocomplete-contenteditable", false, true ); + QUnit.test( "down arrow moves cursor - contenteditable", function( assert ) { + arrowsNavigateElement( assert, "#autocomplete-contenteditable", false, true ); }); - function arrowsInvokeSearch( id, isKeyUp, shouldMove ) { - expect( 1 ); + function arrowsInvokeSearch( assert, id, isKeyUp, shouldMove ) { + assert.expect( 1 ); var didMove = false, element = $( id ).autocomplete({ @@ -140,11 +142,11 @@ test( "allow form submit on enter when menu is not active", function() { didMove = true; }; element.simulate( "keydown", { keyCode: ( isKeyUp ? $.ui.keyCode.UP : $.ui.keyCode.DOWN ) } ); - equal( didMove, shouldMove, "respond to arrow" ); + assert.equal( didMove, shouldMove, "respond to arrow" ); } - function arrowsMoveFocus( id, isKeyUp ) { - expect( 1 ); + function arrowsMoveFocus( assert, id, isKeyUp ) { + assert.expect( 1 ); var element = $( id ).autocomplete({ source: [ "a" ], @@ -152,14 +154,14 @@ test( "allow form submit on enter when menu is not active", function() { minLength: 0 }); element.autocomplete( "instance" )._move = function() { - ok( true, "repsond to arrow" ); + assert.ok( true, "repsond to arrow" ); }; element.autocomplete( "search" ); element.simulate( "keydown", { keyCode: ( isKeyUp ? $.ui.keyCode.UP : $.ui.keyCode.DOWN ) } ); } - function arrowsNavigateElement( id, isKeyUp, shouldMove ) { - expect( 1 ); + function arrowsNavigateElement( assert, id, isKeyUp, shouldMove ) { + assert.expect( 1 ); var didMove = false, element = $( id ).autocomplete({ @@ -172,19 +174,19 @@ test( "allow form submit on enter when menu is not active", function() { }); element.simulate( "keydown", { keyCode: ( isKeyUp ? $.ui.keyCode.UP : $.ui.keyCode.DOWN ) } ); element.simulate( "keypress" ); - equal( didMove, shouldMove, "respond to arrow" ); + assert.equal( didMove, shouldMove, "respond to arrow" ); } })(); -asyncTest( "past end of menu in multiline autocomplete", function() { - expect( 2 ); +QUnit.asyncTest( "past end of menu in multiline autocomplete", function( assert ) { + assert.expect( 2 ); var customVal = "custom value", element = $( "#autocomplete-contenteditable" ).autocomplete({ delay: 0, source: [ "javascript" ], focus: function( event, ui ) { - equal( ui.item.value, "javascript", "Item gained focus" ); + assert.equal( ui.item.value, "javascript", "Item gained focus" ); $( this ).text( customVal ); event.preventDefault(); } @@ -197,20 +199,20 @@ asyncTest( "past end of menu in multiline autocomplete", function() { setTimeout(function() { element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } ); element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } ); - equal( element.text(), customVal ); - start(); + assert.equal( element.text(), customVal ); + QUnit.start(); }); }); -asyncTest( "ESCAPE in multiline autocomplete", function() { - expect( 2 ); +QUnit.asyncTest( "ESCAPE in multiline autocomplete", function( assert ) { + assert.expect( 2 ); var customVal = "custom value", element = $( "#autocomplete-contenteditable" ).autocomplete({ delay: 0, source: [ "javascript" ], focus: function( event, ui ) { - equal( ui.item.value, "javascript", "Item gained focus" ); + assert.equal( ui.item.value, "javascript", "Item gained focus" ); $( this ).text( customVal ); event.preventDefault(); } @@ -223,26 +225,26 @@ asyncTest( "ESCAPE in multiline autocomplete", function() { setTimeout(function() { element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } ); element.simulate( "keydown", { keyCode: $.ui.keyCode.ESCAPE } ); - equal( element.text(), customVal ); - start(); + assert.equal( element.text(), customVal ); + QUnit.start(); }); }); -asyncTest( "handle race condition", function() { - expect( 3 ); +QUnit.asyncTest( "handle race condition", function( assert ) { + assert.expect( 3 ); var count = 0, element = $( "#autocomplete" ).autocomplete({ source: function( request, response ) { count++; if ( request.term.length === 1 ) { - equal( count, 1, "request with 1 character is first" ); + assert.equal( count, 1, "request with 1 character is first" ); setTimeout(function() { response([ "one" ]); setTimeout( checkResults ); }); return; } - equal( count, 2, "request with 2 characters is second" ); + assert.equal( count, 2, "request with 2 characters is second" ); response([ "two" ]); } }); @@ -251,14 +253,14 @@ asyncTest( "handle race condition", function() { element.autocomplete( "search", "ab" ); function checkResults() { - equal( element.autocomplete( "widget" ).find( ".ui-menu-item" ).text(), "two", + assert.equal( element.autocomplete( "widget" ).find( ".ui-menu-item" ).text(), "two", "correct results displayed" ); - start(); + QUnit.start(); } }); -asyncTest( "simultaneous searches (#9334)", function() { - expect( 2 ); +QUnit.asyncTest( "simultaneous searches (#9334)", function( assert ) { + assert.expect( 2 ); var element = $( "#autocomplete" ).autocomplete({ source: function( request, response ) { setTimeout(function() { @@ -266,7 +268,7 @@ asyncTest( "simultaneous searches (#9334)", function() { }); }, response: function() { - ok( true, "response from first instance" ); + assert.ok( true, "response from first instance" ); } }), element2 = $( "#autocomplete-textarea" ).autocomplete({ @@ -276,8 +278,8 @@ asyncTest( "simultaneous searches (#9334)", function() { }); }, response: function() { - ok( true, "response from second instance" ); - start(); + assert.ok( true, "response from second instance" ); + QUnit.start(); } }); @@ -285,60 +287,60 @@ asyncTest( "simultaneous searches (#9334)", function() { element2.autocomplete( "search", "test" ); }); -test( "ARIA", function() { - expect( 13 ); +QUnit.test( "ARIA", function( assert ) { + assert.expect( 13 ); var element = $( "#autocomplete" ).autocomplete({ source: [ "java", "javascript" ] }), liveRegion = element.autocomplete( "instance" ).liveRegion; - equal( liveRegion.children().length, 0, "Empty live region on create" ); - equal( liveRegion.attr( "aria-live" ), "assertive", + assert.equal( liveRegion.children().length, 0, "Empty live region on create" ); + assert.equal( liveRegion.attr( "aria-live" ), "assertive", "Live region's aria-live attribute must be assertive" ); - equal( liveRegion.attr( "aria-relevant" ), "additions", + assert.equal( liveRegion.attr( "aria-relevant" ), "additions", "Live region's aria-relevant attribute must be additions" ); - equal( liveRegion.attr( "role" ), "status", + assert.equal( liveRegion.attr( "role" ), "status", "Live region's role attribute must be status" ); element.autocomplete( "search", "j" ); - equal( liveRegion.children().first().text(), + assert.equal( liveRegion.children().first().text(), "2 results are available, use up and down arrow keys to navigate.", "Live region for multiple values" ); element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } ); - equal( liveRegion.children().filter( ":visible" ).text(), "java", + assert.equal( liveRegion.children().filter( ":visible" ).text(), "java", "Live region changed on keydown to announce the highlighted value" ); element.one( "autocompletefocus", function( event ) { event.preventDefault(); }); element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } ); - equal( liveRegion.children().filter( ":visible" ).text(), "javascript", + assert.equal( liveRegion.children().filter( ":visible" ).text(), "javascript", "Live region updated when default focus is prevented" ); element.autocomplete( "search", "javas" ); - equal( liveRegion.children().filter( ":visible" ).text(), + assert.equal( liveRegion.children().filter( ":visible" ).text(), "1 result is available, use up and down arrow keys to navigate.", "Live region for one value" ); element.autocomplete( "search", "z" ); - equal( liveRegion.children().filter( ":visible" ).text(), "No search results.", + assert.equal( liveRegion.children().filter( ":visible" ).text(), "No search results.", "Live region for no values" ); - equal( liveRegion.children().length, 5, + assert.equal( liveRegion.children().length, 5, "Should be five children in the live region after the above" ); - equal( liveRegion.children().filter( ":visible" ).length, 1, + assert.equal( liveRegion.children().filter( ":visible" ).length, 1, "Only one should be still visible" ); - ok( liveRegion.children().filter( ":visible" )[ 0 ] === liveRegion.children().last()[ 0 ], + assert.ok( liveRegion.children().filter( ":visible" )[ 0 ] === liveRegion.children().last()[ 0 ], "The last one should be the visible one" ); element.autocomplete( "destroy" ); - equal( liveRegion.parent().length, 0, + assert.equal( liveRegion.parent().length, 0, "The liveRegion should be detached after destroy" ); }); -test( "ARIA, aria-label announcement", function() { - expect( 1 ); +QUnit.test( "ARIA, aria-label announcement", function( assert ) { + assert.expect( 1 ); $.widget( "custom.catcomplete", $.ui.autocomplete, { _renderMenu: function( ul, items ) { var that = this; @@ -354,31 +356,31 @@ test( "ARIA, aria-label announcement", function() { liveRegion = element.catcomplete( "instance" ).liveRegion; element.catcomplete( "search", "a" ); element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } ); - equal( liveRegion.children().filter( ":visible" ).text(), "People : anders andersson", + assert.equal( liveRegion.children().filter( ":visible" ).text(), "People : anders andersson", "Live region changed on keydown to announce the highlighted value's aria-label attribute" ); }); -test( "ARIA, init on detached input", function() { - expect( 1 ); +QUnit.test( "ARIA, init on detached input", function( assert ) { + assert.expect( 1 ); var element = $( "" ).autocomplete({ source: [ "java", "javascript" ] }), liveRegion = element.autocomplete( "instance" ).liveRegion; - equal( liveRegion.parent().length, 1, "liveRegion must have a parent" ); + assert.equal( liveRegion.parent().length, 1, "liveRegion must have a parent" ); }); -test( ".replaceWith() (#9172)", function() { - expect( 1 ); +QUnit.test( ".replaceWith() (#9172)", function( assert ) { + assert.expect( 1 ); var element = $( "#autocomplete" ).autocomplete(), replacement = "", parent = element.parent(); element.replaceWith( replacement ); - equal( parent.html().toLowerCase(), replacement ); + assert.equal( parent.html().toLowerCase(), replacement ); }); -asyncTest( "Search if the user retypes the same value (#7434)", function() { - expect( 3 ); +QUnit.asyncTest( "Search if the user retypes the same value (#7434)", function( assert ) { + assert.expect( 3 ); var element = $( "#autocomplete" ).autocomplete({ source: [ "java", "javascript" ], delay: 0 @@ -387,13 +389,13 @@ asyncTest( "Search if the user retypes the same value (#7434)", function() { element.val( "j" ).simulate( "keydown" ); setTimeout(function() { - ok( menu.is( ":visible" ), "menu displays initially" ); + assert.ok( menu.is( ":visible" ), "menu displays initially" ); element.trigger( "blur" ); - ok( !menu.is( ":visible" ), "menu hidden after blur" ); + assert.ok( !menu.is( ":visible" ), "menu hidden after blur" ); element.val( "j" ).simulate( "keydown" ); setTimeout(function() { - ok( menu.is( ":visible" ), "menu displays after typing the same value" ); - start(); + assert.ok( menu.is( ":visible" ), "menu displays after typing the same value" ); + QUnit.start(); }); }); }); diff --git a/tests/unit/autocomplete/events.js b/tests/unit/autocomplete/events.js index 8f96fb77f1d..2ef9a464d52 100644 --- a/tests/unit/autocomplete/events.js +++ b/tests/unit/autocomplete/events.js @@ -1,9 +1,13 @@ -define( [ +define([ + "lib/qunit", "jquery", + "./helper", "ui/autocomplete" -], function( $ ) { +], function( QUnit, $, testHelper ) { -module( "autocomplete: events" ); +var setupTeardown = testHelper.setupTeardown; + +QUnit.module( "autocomplete: events", setupTeardown() ); var data = [ "Clojure", "COBOL", "ColdFusion", "Java", "JavaScript", "Scala", "Scheme" ]; @@ -24,18 +28,18 @@ $.each([ valueMethod: "text" } ], function( i, settings ) { - asyncTest( "all events - " + settings.type, function() { - expect( 13 ); + QUnit.asyncTest( "all events - " + settings.type, function( assert ) { + assert.expect( 13 ); var element = $( settings.selector ) .autocomplete({ autoFocus: false, delay: 0, source: data, search: function( event ) { - equal( event.originalEvent.type, "keydown", "search originalEvent" ); + assert.equal( event.originalEvent.type, "keydown", "search originalEvent" ); }, response: function( event, ui ) { - deepEqual( ui.content, [ + assert.deepEqual( ui.content, [ { label: "Clojure", value: "Clojure" }, { label: "Java", value: "Java" }, { label: "JavaScript", value: "JavaScript" } @@ -43,32 +47,32 @@ $.each([ ui.content.splice( 0, 1 ); }, open: function() { - ok( menu.is( ":visible" ), "menu open on open" ); + assert.ok( menu.is( ":visible" ), "menu open on open" ); }, focus: function( event, ui ) { - equal( event.originalEvent.type, "menufocus", "focus originalEvent" ); - deepEqual( ui.item, { label: "Java", value: "Java" }, "focus ui.item" ); + assert.equal( event.originalEvent.type, "menufocus", "focus originalEvent" ); + assert.deepEqual( ui.item, { label: "Java", value: "Java" }, "focus ui.item" ); }, close: function( event ) { - equal( event.originalEvent.type, "menuselect", "close originalEvent" ); - ok( menu.is( ":hidden" ), "menu closed on close" ); + assert.equal( event.originalEvent.type, "menuselect", "close originalEvent" ); + assert.ok( menu.is( ":hidden" ), "menu closed on close" ); }, select: function( event, ui ) { - equal( event.originalEvent.type, "menuselect", "select originalEvent" ); - deepEqual( ui.item, { label: "Java", value: "Java" }, "select ui.item" ); + assert.equal( event.originalEvent.type, "menuselect", "select originalEvent" ); + assert.deepEqual( ui.item, { label: "Java", value: "Java" }, "select ui.item" ); }, change: function( event, ui ) { - equal( event.originalEvent.type, "blur", "change originalEvent" ); - deepEqual( ui.item, { label: "Java", value: "Java" }, "change ui.item" ); - ok( menu.is( ":hidden" ), "menu closed on change" ); - start(); + assert.equal( event.originalEvent.type, "blur", "change originalEvent" ); + assert.deepEqual( ui.item, { label: "Java", value: "Java" }, "change ui.item" ); + assert.ok( menu.is( ":hidden" ), "menu closed on change" ); + QUnit.start(); } }), menu = element.autocomplete( "widget" ); element.simulate( "focus" )[ settings.valueMethod ]( "j" ).trigger( "keydown" ); setTimeout(function() { - ok( menu.is( ":visible" ), "menu is visible after delay" ); + assert.ok( menu.is( ":visible" ), "menu is visible after delay" ); element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } ); element.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } ); // blur must be async for IE to handle it properly @@ -79,53 +83,53 @@ $.each([ }); }); -asyncTest( "change without selection", function() { - expect( 1 ); +QUnit.asyncTest( "change without selection", function( assert ) { + assert.expect( 1 ); var element = $( "#autocomplete" ).autocomplete({ delay: 0, source: data, change: function( event, ui ) { - strictEqual( ui.item, null ); - start(); + assert.strictEqual( ui.item, null ); + QUnit.start(); } }); element.triggerHandler( "focus" ); element.val( "ja" ).triggerHandler( "blur" ); }); -asyncTest( "cancel search", function() { - expect( 6 ); +QUnit.asyncTest( "cancel search", function( assert ) { + assert.expect( 6 ); var first = true, element = $( "#autocomplete" ).autocomplete({ delay: 0, source: data, search: function() { if ( first ) { - equal( element.val(), "ja", "val on first search" ); + assert.equal( element.val(), "ja", "val on first search" ); first = false; return false; } - equal( element.val(), "java", "val on second search" ); + assert.equal( element.val(), "java", "val on second search" ); }, open: function() { - ok( true, "menu opened" ); + assert.ok( true, "menu opened" ); } }), menu = element.autocomplete( "widget" ); element.val( "ja" ).trigger( "keydown" ); setTimeout(function() { - ok( menu.is( ":hidden" ), "menu is hidden after first search" ); + assert.ok( menu.is( ":hidden" ), "menu is hidden after first search" ); element.val( "java" ).trigger( "keydown" ); setTimeout(function() { - ok( menu.is( ":visible" ), "menu is visible after second search" ); - equal( menu.find( ".ui-menu-item" ).length, 2, "# of menu items" ); - start(); + assert.ok( menu.is( ":visible" ), "menu is visible after second search" ); + assert.equal( menu.find( ".ui-menu-item" ).length, 2, "# of menu items" ); + QUnit.start(); }); }); }); -asyncTest( "cancel focus", function() { - expect( 1 ); +QUnit.asyncTest( "cancel focus", function( assert ) { + assert.expect( 1 ); var customVal = "custom value", element = $( "#autocomplete" ).autocomplete({ delay: 0, @@ -138,13 +142,13 @@ asyncTest( "cancel focus", function() { element.val( "ja" ).trigger( "keydown" ); setTimeout(function() { element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } ); - equal( element.val(), customVal ); - start(); + assert.equal( element.val(), customVal ); + QUnit.start(); }); }); -asyncTest( "cancel select", function() { - expect( 1 ); +QUnit.asyncTest( "cancel select", function( assert ) { + assert.expect( 1 ); var customVal = "custom value", element = $( "#autocomplete" ).autocomplete({ delay: 0, @@ -158,25 +162,25 @@ asyncTest( "cancel select", function() { setTimeout(function() { element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } ); element.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } ); - equal( element.val(), customVal ); - start(); + assert.equal( element.val(), customVal ); + QUnit.start(); }); }); -asyncTest( "blur during remote search", function() { - expect( 1 ); +QUnit.asyncTest( "blur during remote search", function( assert ) { + assert.expect( 1 ); var ac = $( "#autocomplete" ).autocomplete({ delay: 0, source: function( request, response ) { - ok( true, "trigger request" ); + assert.ok( true, "trigger request" ); ac.simulate( "blur" ); setTimeout(function() { response([ "result" ]); - start(); + QUnit.start(); }, 25); }, open: function() { - ok( false, "opened after a blur" ); + assert.ok( false, "opened after a blur" ); } }); ac.val( "ro" ).trigger( "keydown" ); diff --git a/tests/unit/autocomplete/helper.js b/tests/unit/autocomplete/helper.js new file mode 100644 index 00000000000..e382857a261 --- /dev/null +++ b/tests/unit/autocomplete/helper.js @@ -0,0 +1,26 @@ +define( [ + "intern!qunit", + "jquery", + "lib/helper", + "lib/css", + "text!tests/unit/autocomplete/autocomplete.html", + "ui/accordion", + "jquery-simulate", + "./common" +], function( QUnit, $, helper, cssjs, htmlContent ) { +cssjs( { module: "core menu autocomplete" } ); + +return $.extend( helper, { + setupTeardown: function() { + return { + setup: function() { + $("body").append(htmlContent); + }, + teardown: function() { + $("#qunit-fixture").remove(); + } + }; + } +} ); + +} ); diff --git a/tests/unit/autocomplete/methods.js b/tests/unit/autocomplete/methods.js index 32080207add..72423f7b6ce 100644 --- a/tests/unit/autocomplete/methods.js +++ b/tests/unit/autocomplete/methods.js @@ -1,19 +1,22 @@ -define( [ +define([ 'qunit', "jquery", + "./helper", "ui/autocomplete" -], function( $ ) { +], function( QUnit, $, testHelper ) { -module( "autocomplete: methods" ); +var setupTeardown = testHelper.setupTeardown; -test( "destroy", function( assert ) { - expect( 1 ); +QUnit.module( "autocomplete: methods", setupTeardown() ); + +QUnit.test( "destroy", function( assert ) { + assert.expect( 1 ); assert.domEqual( "#autocomplete", function() { $( "#autocomplete" ).autocomplete().autocomplete( "destroy" ); }); }); -test( "search, close", function() { - expect( 6 ); +QUnit.test( "search, close", function( assert ) { + assert.expect( 6 ); var data = [ "c++", "java", "php", "coldfusion", "javascript", "asp", "ruby", "python", "c", "scala", "groovy", "haskell", "perl" ], element = $( "#autocomplete" ).autocomplete({ source: data, @@ -21,27 +24,27 @@ test( "search, close", function() { }), menu = element.autocomplete( "widget" ); - ok( menu.is( ":hidden" ), "menu is hidden on init" ); + assert.ok( menu.is( ":hidden" ), "menu is hidden on init" ); element.autocomplete( "search" ); - ok( menu.is( ":visible" ), "menu is visible after search" ); - equal( menu.find( ".ui-menu-item" ).length, data.length, "all items for a blank search" ); + assert.ok( menu.is( ":visible" ), "menu is visible after search" ); + assert.equal( menu.find( ".ui-menu-item" ).length, data.length, "all items for a blank search" ); element.val( "has" ).autocomplete( "search" ); - equal( menu.find( ".ui-menu-item" ).text(), "haskell", "only one item for set input value" ); + assert.equal( menu.find( ".ui-menu-item" ).text(), "haskell", "only one item for set input value" ); element.autocomplete( "search", "ja" ); - equal( menu.find( ".ui-menu-item" ).length, 2, "only java and javascript for 'ja'" ); + assert.equal( menu.find( ".ui-menu-item" ).length, 2, "only java and javascript for 'ja'" ); element.autocomplete( "close" ); - ok( menu.is( ":hidden" ), "menu is hidden after close" ); + assert.ok( menu.is( ":hidden" ), "menu is hidden after close" ); }); -test( "widget", function( assert ) { - expect( 2 ); +QUnit.test( "widget", function( assert ) { + assert.expect( 2 ); var element = $( "#autocomplete" ).autocomplete(), widgetElement = element.autocomplete( "widget" ); - equal( widgetElement.length, 1, "one element" ); + assert.equal( widgetElement.length, 1, "one element" ); assert.hasClasses( widgetElement, "ui-menu" ); }); diff --git a/tests/unit/autocomplete/options.js b/tests/unit/autocomplete/options.js index 06c75722b32..63bffe71863 100644 --- a/tests/unit/autocomplete/options.js +++ b/tests/unit/autocomplete/options.js @@ -1,108 +1,110 @@ -define( [ +define([ 'qunit', "jquery", + "./helper", "ui/autocomplete" -], function( $ ) { +], function( QUnit, $, testHelper ) { -module( "autocomplete: options" ); +var setupTeardown = testHelper.setupTeardown; + +QUnit.module( "autocomplete: options", setupTeardown() ); var data = [ "c++", "java", "php", "coldfusion", "javascript", "asp", "ruby", "python", "c", "scala", "groovy", "haskell", "perl" ]; -test( "appendTo: null", function() { - expect( 1 ); +QUnit.test( "appendTo: null", function( assert ) { + assert.expect( 1 ); var element = $( "#autocomplete" ).autocomplete(); - equal( element.autocomplete( "widget" ).parent()[ 0 ], document.body, + assert.equal( element.autocomplete( "widget" ).parent()[ 0 ], document.body, "defaults to body" ); element.autocomplete( "destroy" ); }); -test( "appendTo: explicit", function() { - expect( 6 ); +QUnit.test( "appendTo: explicit", function( assert ) { + assert.expect( 6 ); var detached = $( "