diff options
author | Mike Sherov <mike.sherov@gmail.com> | 2013-03-26 09:18:58 -0400 |
---|---|---|
committer | Mike Sherov <mike.sherov@gmail.com> | 2013-03-26 09:22:35 -0400 |
commit | 38f93c4ac19d85649e08f666086c1234ff7360f3 (patch) | |
tree | 400c26e379a17433fcbed3079465e075b081d5a1 | |
parent | e9faec96ed0152a4943efa838b9025d63e3e3093 (diff) | |
download | jquery-ui-38f93c4ac19d85649e08f666086c1234ff7360f3.tar.gz jquery-ui-38f93c4ac19d85649e08f666086c1234ff7360f3.zip |
Draggable Tests: Minor style fixes and removing unnecessary setup and teardown for core tests.
-rw-r--r-- | tests/unit/draggable/draggable_core.js | 21 | ||||
-rw-r--r-- | tests/unit/draggable/draggable_options.js | 4 |
2 files changed, 7 insertions, 18 deletions
diff --git a/tests/unit/draggable/draggable_core.js b/tests/unit/draggable/draggable_core.js index ab63c3703..f22d483a6 100644 --- a/tests/unit/draggable/draggable_core.js +++ b/tests/unit/draggable/draggable_core.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,18 +44,18 @@ 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") @@ -74,7 +63,7 @@ test( "resizable handle with complex markup (#8756 / #8757)", function() { ); 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 } ); diff --git a/tests/unit/draggable/draggable_options.js b/tests/unit/draggable/draggable_options.js index bf47b4354..8e1fde0bd 100644 --- a/tests/unit/draggable/draggable_options.js +++ b/tests/unit/draggable/draggable_options.js @@ -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() { |