Permalink
Browse files

Draggable Tests: Minor style fixes and removing unnecessary setup and…

… teardown for core tests.
  • Loading branch information...
1 parent e9faec9 commit 38f93c4ac19d85649e08f666086c1234ff7360f3 @mikesherov mikesherov committed Mar 26, 2013
Showing with 7 additions and 18 deletions.
  1. +5 −16 tests/unit/draggable/draggable_core.js
  2. +2 −2 tests/unit/draggable/draggable_options.js
@@ -4,18 +4,7 @@
(function( $ ) {
-var relativeElement, absoluteElement;
-
-module( "draggable: core", {
- setup: function() {
- relativeElement = $("<div style='width: 200px; height: 100px;'>Relative</div>").appendTo("#qunit-fixture");
- absoluteElement = $("<div style='background: green; width: 200px; height: 100px; position: absolute; top: 10px; left: 10px;'><span>Absolute</span></div>").appendTo("#qunit-fixture");
- },
- teardown: function() {
- relativeElement.remove();
- absoluteElement.remove();
- }
-});
+module( "draggable: core" );
test( "element types", function() {
var typeNames = (
@@ -55,26 +44,26 @@ test( "element types", function() {
test( "No options, relative", function() {
expect( 1 );
- TestHelpers.draggable.shouldMove( relativeElement.draggable() );
+ TestHelpers.draggable.shouldMove( $( "#draggable1" ).draggable() );
});
test( "No options, absolute", function() {
expect( 1 );
- TestHelpers.draggable.shouldMove( absoluteElement.draggable() );
+ TestHelpers.draggable.shouldMove( $( "#draggable2" ).draggable() );
});
test( "resizable handle with complex markup (#8756 / #8757)", function() {
expect( 2 );
- relativeElement
+ $( "#draggable1" )
.append(
$("<div>")
.addClass("ui-resizable-handle ui-resizable-w")
.append( $("<div>") )
);
var handle = $(".ui-resizable-w div"),
- target = relativeElement.draggable().resizable({ handles: "all" });
+ target = $( "#draggable1" ).draggable().resizable({ handles: "all" });
// todo: fix resizable so it doesn't require a mouseover
handle.simulate("mouseover").simulate( "drag", { dx: -50 } );
@@ -1056,11 +1056,11 @@ test( "scope", function() {
$( "#droppable" ).droppable({ scope: "tasks" });
- TestHelpers.draggable.testDrag( element, element, 100, 100, 0, 0, "revert: valid reverts when dropped on a droppable" );
+ TestHelpers.draggable.testDrag( element, element, 100, 100, 0, 0, "revert: valid reverts when dropped on a droppable in scope" );
$( "#droppable" ).droppable( "destroy" ).droppable({ scope: "nottasks" });
- TestHelpers.draggable.testDrag( element, element, 100, 100, 100, 100, "revert: valid reverts when dropped on a droppable" );
+ TestHelpers.draggable.testDrag( element, element, 100, 100, 100, 100, "revert: valid reverts when dropped on a droppable out of scope" );
});
test( "scroll, scrollSensitivity, and scrollSpeed", function() {

0 comments on commit 38f93c4

Please sign in to comment.