Droppable: Use new has/lacksClasses assertions for all class checks

This commit is contained in:
Alexander Schmitz 2015-01-30 09:57:56 -05:00
parent 2d5857ca9e
commit 15a9ed7708
4 changed files with 11 additions and 9 deletions

View File

@ -12,6 +12,7 @@
<script src="../../../external/qunit/qunit.js"></script> <script src="../../../external/qunit/qunit.js"></script>
<script src="../../../external/jquery-simulate/jquery.simulate.js"></script> <script src="../../../external/jquery-simulate/jquery.simulate.js"></script>
<script src="../testsuite.js"></script> <script src="../testsuite.js"></script>
<script src="../../../external/qunit-assert-classes/qunit-assert-classes.js"></script>
<script> <script>
TestHelpers.loadResources({ TestHelpers.loadResources({
css: [ "core" ], css: [ "core" ],

View File

@ -2,7 +2,7 @@
module( "droppable: events" ); module( "droppable: events" );
test( "droppable destruction/recreation on drop event", function() { test( "droppable destruction/recreation on drop event", function( assert ) {
expect( 1 ); expect( 1 );
var config = { var config = {
@ -32,7 +32,7 @@ test( "droppable destruction/recreation on drop event", function() {
dy: dy dy: dy
}); });
ok( !droppable2.hasClass( "active" ), "subsequent droppable no longer active" ); assert.lacksClasses( droppable2, "active", "subsequent droppable no longer active" );
}); });
// todo: comment the following in when ready to actually test // todo: comment the following in when ready to actually test

View File

@ -63,7 +63,7 @@ test("enable", function() {
equal(actual, expected, "enable is chainable"); equal(actual, expected, "enable is chainable");
}); });
test( "disable", function() { test( "disable", function( assert ) {
expect( 10 ); expect( 10 );
var actual, expected, var actual, expected,
@ -77,9 +77,9 @@ test( "disable", function() {
element.droppable({ disabled: false }); element.droppable({ disabled: false });
TestHelpers.droppable.shouldDrop(); TestHelpers.droppable.shouldDrop();
element.droppable( "option", "disabled", true ); element.droppable( "option", "disabled", true );
ok( !element.droppable( "widget" ).hasClass( "ui-state-disabled" ), "element does not get ui-state-disabled" ); assert.lacksClasses( element.droppable( "widget" ), "ui-state-disabled" );
ok( !element.droppable( "widget" ).attr( "aria-disabled" ), "element does not get aria-disabled" ); ok( !element.droppable( "widget" ).attr( "aria-disabled" ), "element does not get aria-disabled" );
ok( element.droppable( "widget" ).hasClass( "ui-droppable-disabled" ), "element gets ui-droppable-disabled" ); assert.hasClasses( element.droppable( "widget" ), "ui-droppable-disabled" );
equal( element.droppable( "option", "disabled" ), true, "disabled option setter" ); equal( element.droppable( "option", "disabled" ), true, "disabled option setter" );
TestHelpers.droppable.shouldNotDrop(); TestHelpers.droppable.shouldNotDrop();

View File

@ -22,17 +22,18 @@ test( "activeClass", function() {
ok(false, 'missing test - untested code is broken code'); ok(false, 'missing test - untested code is broken code');
}); });
*/ */
test( "{ addClasses: true }, default", function() { test( "{ addClasses: true }, default", function( assert ) {
expect( 1 ); expect( 1 );
var el = $( "<div />" ).droppable({ addClasses: true }); var el = $( "<div />" ).droppable({ addClasses: true });
ok( el.is( ".ui-droppable" ), "'ui-droppable' class added" ); assert.hasClasses( el, "ui-droppable" );
el.droppable( "destroy" ); el.droppable( "destroy" );
}); });
test( "{ addClasses: false }", function() { test( "{ addClasses: false }", function( assert ) {
expect( 1 ); expect( 1 );
var el = $( "<div />" ).droppable({ addClasses: false }); var el = $( "<div />" ).droppable({ addClasses: false });
ok( !el.is( ".ui-droppable" ), "'ui-droppable' class not added" );
assert.lacksClasses( el, "ui-droppable" );
el.droppable( "destroy" ); el.droppable( "destroy" );
}); });