mirror of
https://github.com/jquery/jquery-ui.git
synced 2024-10-05 01:44:18 +00:00
Dialog: Use new has/lacksClasses assertions for all class checks
This commit is contained in:
parent
415675eca1
commit
a9fa490418
@ -8,7 +8,7 @@ TestHelpers.commonWidgetTests( "dialog", {
|
|||||||
"ui-dialog-titlebar": "ui-corner-all"
|
"ui-dialog-titlebar": "ui-corner-all"
|
||||||
},
|
},
|
||||||
closeOnEscape: true,
|
closeOnEscape: true,
|
||||||
closeText: "close",
|
closeText: "Close",
|
||||||
dialogClass: "",
|
dialogClass: "",
|
||||||
disabled: false,
|
disabled: false,
|
||||||
draggable: true,
|
draggable: true,
|
||||||
|
@ -30,7 +30,7 @@
|
|||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<script src="dialog_common_derecated.js"></script>
|
<script src="dialog_common_deprecated.js"></script>
|
||||||
<script src="dialog_core.js"></script>
|
<script src="dialog_core.js"></script>
|
||||||
<script src="dialog_events.js"></script>
|
<script src="dialog_events.js"></script>
|
||||||
<script src="dialog_methods.js"></script>
|
<script src="dialog_methods.js"></script>
|
||||||
|
@ -2,26 +2,25 @@
|
|||||||
|
|
||||||
module( "dialog (deprecated): options" );
|
module( "dialog (deprecated): options" );
|
||||||
|
|
||||||
test( "dialogClass", function() {
|
test( "dialogClass", function( assert ) {
|
||||||
expect( 6 );
|
expect( 5 );
|
||||||
|
|
||||||
var element = $( "<div>" ).dialog(),
|
var element = $( "<div>" ).dialog(),
|
||||||
widget = element.dialog( "widget" );
|
widget = element.dialog( "widget" );
|
||||||
equal( widget.is( ".foo" ), false, "dialogClass not specified. class not added" );
|
assert.lacksClasses( widget, "foo", "dialogClass not specified. class not added" );
|
||||||
element.remove();
|
element.remove();
|
||||||
|
|
||||||
element = $( "<div>" ).dialog({ dialogClass: "foo" });
|
element = $( "<div>" ).dialog({ dialogClass: "foo" });
|
||||||
widget = element.dialog( "widget" );
|
widget = element.dialog( "widget" );
|
||||||
equal( widget.is( ".foo" ), true, "dialogClass in init, foo class added" );
|
assert.hasClasses( widget, "foo", "dialogClass in init, foo class added" );
|
||||||
element.dialog( "option", "dialogClass", "foobar" );
|
element.dialog( "option", "dialogClass", "foobar" );
|
||||||
equal( widget.is( ".foo" ), false, "dialogClass changed, previous one was removed" );
|
assert.lacksClasses( widget, "foo", "dialogClass changed, previous one was removed" );
|
||||||
equal( widget.is( ".foobar" ), true, "dialogClass changed, new one was added" );
|
assert.hasClasses( widget, "foobar", "dialogClass changed, new one was added" );
|
||||||
element.remove();
|
element.remove();
|
||||||
|
|
||||||
element = $( "<div>" ).dialog({ dialogClass: "foo bar" });
|
element = $( "<div>" ).dialog({ dialogClass: "foo bar" });
|
||||||
widget = element.dialog( "widget" );
|
widget = element.dialog( "widget" );
|
||||||
equal( widget.is( ".foo" ), true, "dialogClass in init, two classes. foo class added" );
|
assert.hasClasses( widget, "foo bar", "dialogClass in init, two classes." );
|
||||||
equal( widget.is( ".bar" ), true, "dialogClass in init, two classes. bar class added" );
|
|
||||||
element.remove();
|
element.remove();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -100,13 +100,12 @@ test("#4980: Destroy should place element back in original DOM position", functi
|
|||||||
ok($.contains(container[0], modal[0]), "dialog(destroy) should place element back in original DOM position");
|
ok($.contains(container[0], modal[0]), "dialog(destroy) should place element back in original DOM position");
|
||||||
});
|
});
|
||||||
|
|
||||||
test( "enable/disable disabled", function() {
|
test( "enable/disable disabled", function( assert ) {
|
||||||
expect( 4 );
|
expect( 3 );
|
||||||
var element = $( "<div></div>" ).dialog();
|
var element = $( "<div></div>" ).dialog();
|
||||||
element.dialog( "disable" );
|
element.dialog( "disable" );
|
||||||
equal(element.dialog( "option", "disabled" ), false, "disable method doesn't do anything" );
|
equal(element.dialog( "option", "disabled" ), false, "disable method doesn't do anything" );
|
||||||
ok( !element.dialog( "widget" ).hasClass( "ui-dialog-disabled" ), "disable method doesn't add ui-dialog-disabled class" );
|
assert.lacksClasses( element, "ui-dialog-disabled ui-state-disabled" );
|
||||||
ok( !element.dialog( "widget" ).hasClass( "ui-state-disabled" ), "disable method doesn't add ui-state-disabled class" );
|
|
||||||
ok( !element.dialog( "widget" ).attr( "aria-disabled" ), "disable method doesn't add aria-disabled" );
|
ok( !element.dialog( "widget" ).attr( "aria-disabled" ), "disable method doesn't add aria-disabled" );
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -78,7 +78,7 @@ test("autoOpen", function() {
|
|||||||
element.remove();
|
element.remove();
|
||||||
});
|
});
|
||||||
|
|
||||||
test("buttons", function() {
|
test("buttons", function( assert ) {
|
||||||
expect(21);
|
expect(21);
|
||||||
|
|
||||||
var btn, i, newButtons,
|
var btn, i, newButtons,
|
||||||
@ -105,8 +105,8 @@ test("buttons", function() {
|
|||||||
i++;
|
i++;
|
||||||
});
|
});
|
||||||
|
|
||||||
ok(btn.parent().hasClass("ui-dialog-buttonset"), "buttons in container");
|
assert.hasClasses( btn.parent(), "ui-dialog-buttonset" );
|
||||||
ok(element.parent().hasClass("ui-dialog-buttons"), "dialog wrapper adds class about having buttons");
|
assert.hasClasses( element.parent(), "ui-dialog-buttons" );
|
||||||
|
|
||||||
btn.trigger("click");
|
btn.trigger("click");
|
||||||
|
|
||||||
@ -136,12 +136,11 @@ test("buttons", function() {
|
|||||||
btn = element.dialog( "widget" ).find( ".ui-dialog-buttonpane button" );
|
btn = element.dialog( "widget" ).find( ".ui-dialog-buttonpane button" );
|
||||||
equal(btn.length, 0, "all buttons have been removed");
|
equal(btn.length, 0, "all buttons have been removed");
|
||||||
equal(element.find(".ui-dialog-buttonset").length, 0, "buttonset has been removed");
|
equal(element.find(".ui-dialog-buttonset").length, 0, "buttonset has been removed");
|
||||||
equal(element.parent().hasClass("ui-dialog-buttons"), false, "dialog wrapper removes class about having buttons");
|
assert.lacksClasses( element.parent(), "ui-dialog-buttons" );
|
||||||
|
|
||||||
element.remove();
|
element.remove();
|
||||||
});
|
});
|
||||||
|
|
||||||
test("buttons - advanced", function() {
|
test("buttons - advanced", function( assert ) {
|
||||||
expect( 7 );
|
expect( 7 );
|
||||||
|
|
||||||
var buttons,
|
var buttons,
|
||||||
@ -166,7 +165,7 @@ test("buttons - advanced", function() {
|
|||||||
equal(buttons.length, 1, "correct number of buttons");
|
equal(buttons.length, 1, "correct number of buttons");
|
||||||
equal(buttons.attr("id"), "my-button-id", "correct id");
|
equal(buttons.attr("id"), "my-button-id", "correct id");
|
||||||
equal(buttons.text(), "a button", "correct label");
|
equal(buttons.text(), "a button", "correct label");
|
||||||
ok(buttons.hasClass("additional-class"), "additional classes added");
|
assert.hasClasses( buttons, "additional-class" );
|
||||||
deepEqual( buttons.button("option", "icons"), { primary: "ui-icon-cancel", secondary: null } );
|
deepEqual( buttons.button("option", "icons"), { primary: "ui-icon-cancel", secondary: null } );
|
||||||
equal( buttons.button( "option", "text" ), false );
|
equal( buttons.button( "option", "text" ), false );
|
||||||
buttons.click();
|
buttons.click();
|
||||||
|
Loading…
Reference in New Issue
Block a user