Skip to content

Commit 38f93c4

Browse files
committed
Draggable Tests: Minor style fixes and removing unnecessary setup and teardown for core tests.
1 parent e9faec9 commit 38f93c4

File tree

2 files changed

+7
-18
lines changed

2 files changed

+7
-18
lines changed

tests/unit/draggable/draggable_core.js

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,7 @@
44

55
(function( $ ) {
66

7-
var relativeElement, absoluteElement;
8-
9-
module( "draggable: core", {
10-
setup: function() {
11-
relativeElement = $("<div style='width: 200px; height: 100px;'>Relative</div>").appendTo("#qunit-fixture");
12-
absoluteElement = $("<div style='background: green; width: 200px; height: 100px; position: absolute; top: 10px; left: 10px;'><span>Absolute</span></div>").appendTo("#qunit-fixture");
13-
},
14-
teardown: function() {
15-
relativeElement.remove();
16-
absoluteElement.remove();
17-
}
18-
});
7+
module( "draggable: core" );
198

209
test( "element types", function() {
2110
var typeNames = (
@@ -55,26 +44,26 @@ test( "element types", function() {
5544

5645
test( "No options, relative", function() {
5746
expect( 1 );
58-
TestHelpers.draggable.shouldMove( relativeElement.draggable() );
47+
TestHelpers.draggable.shouldMove( $( "#draggable1" ).draggable() );
5948
});
6049

6150
test( "No options, absolute", function() {
6251
expect( 1 );
63-
TestHelpers.draggable.shouldMove( absoluteElement.draggable() );
52+
TestHelpers.draggable.shouldMove( $( "#draggable2" ).draggable() );
6453
});
6554

6655
test( "resizable handle with complex markup (#8756 / #8757)", function() {
6756
expect( 2 );
6857

69-
relativeElement
58+
$( "#draggable1" )
7059
.append(
7160
$("<div>")
7261
.addClass("ui-resizable-handle ui-resizable-w")
7362
.append( $("<div>") )
7463
);
7564

7665
var handle = $(".ui-resizable-w div"),
77-
target = relativeElement.draggable().resizable({ handles: "all" });
66+
target = $( "#draggable1" ).draggable().resizable({ handles: "all" });
7867

7968
// todo: fix resizable so it doesn't require a mouseover
8069
handle.simulate("mouseover").simulate( "drag", { dx: -50 } );

tests/unit/draggable/draggable_options.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1056,11 +1056,11 @@ test( "scope", function() {
10561056

10571057
$( "#droppable" ).droppable({ scope: "tasks" });
10581058

1059-
TestHelpers.draggable.testDrag( element, element, 100, 100, 0, 0, "revert: valid reverts when dropped on a droppable" );
1059+
TestHelpers.draggable.testDrag( element, element, 100, 100, 0, 0, "revert: valid reverts when dropped on a droppable in scope" );
10601060

10611061
$( "#droppable" ).droppable( "destroy" ).droppable({ scope: "nottasks" });
10621062

1063-
TestHelpers.draggable.testDrag( element, element, 100, 100, 100, 100, "revert: valid reverts when dropped on a droppable" );
1063+
TestHelpers.draggable.testDrag( element, element, 100, 100, 100, 100, "revert: valid reverts when dropped on a droppable out of scope" );
10641064
});
10651065

10661066
test( "scroll, scrollSensitivity, and scrollSpeed", function() {

0 commit comments

Comments
 (0)