1 files changed, 64 insertions, 59 deletions

diff --git a/tests/unit/draggable/draggable_methods.js b/tests/unit/draggable/draggable_methods.js
index 43db285ce..901c261d6 100644
--- a/tests/unit/draggable/draggable_methods.js
+++ b/tests/unit/draggable/draggable_methods.js
@@ -1,94 +1,99 @@
 /*
  * draggable_methods.js
  */
-(function($) {
+(function( $ ) {
 
-module("draggable: methods");
+var element;
 
-test("init", function() {
-	expect(5);
+module( "draggable: methods", {
+	setup: function() {
+		element = $("<div style='background: green; width: 200px; height: 100px; position: absolute; top: 10px; left: 10px;'><span>Absolute</span></div>").appendTo("#qunit-fixture");
+	},
+	teardown: function() {
+		element.remove();
+	}
+});
+
+test( "init", function() {
+	expect( 5 );
 
-	$("<div></div>").appendTo("body").draggable().remove();
-	ok(true, ".draggable() called on element");
+	element.draggable();
+	ok( true, ".draggable() called on element" );
 
 	$([]).draggable();
-	ok(true, ".draggable() called on empty collection");
+	ok( true, ".draggable() called on empty collection" );
 
 	$("<div></div>").draggable();
-	ok(true, ".draggable() called on disconnected DOMElement");
+	ok( true, ".draggable() called on disconnected DOMElement" );
 
-	$("<div></div>").draggable().draggable("option", "foo");
-	ok(true, "arbitrary option getter after init");
+	element.draggable( "option", "foo" );
+	ok( true, "arbitrary option getter after init" );
 
-	$("<div></div>").draggable().draggable("option", "foo", "bar");
-	ok(true, "arbitrary option setter after init");
+	element.draggable( "option", "foo", "bar" );
+	ok( true, "arbitrary option setter after init" );
 });
 
-test("destroy", function() {
-	expect(4);
-	$("<div></div>").appendTo("body").draggable().draggable("destroy").remove();
-	ok(true, ".draggable('destroy') called on element");
+test( "destroy", function() {
+	expect( 4 );
+
+	element.draggable().draggable("destroy");
+	ok( true, ".draggable('destroy') called on element" );
 
 	$([]).draggable().draggable("destroy");
-	ok(true, ".draggable('destroy') called on empty collection");
+	ok( true, ".draggable('destroy') called on empty collection" );
 
-	$("<div></div>").draggable().draggable("destroy");
-	ok(true, ".draggable('destroy') called on disconnected DOMElement");
+	element.draggable().draggable("destroy");
+	ok( true, ".draggable('destroy') called on disconnected DOMElement" );
 
-	var expected = $("<div></div>").draggable(),
+	var expected = element.draggable(),
 		actual = expected.draggable("destroy");
-	equal(actual, expected, "destroy is chainable");
+	equal( actual, expected, "destroy is chainable" );
 });
 
-test("enable", function() {
-	expect(7);
+test( "enable", function() {
+	expect( 7 );
 
-	var expected, actual, el;
+	element.draggable({ disabled: true });
+	TestHelpers.draggable.shouldNotMove( element, ".draggable({ disabled: true })" );
 
-	el = $("#draggable2").draggable({ disabled: true });
-	TestHelpers.draggable.shouldNotMove(el, ".draggable({ disabled: true })");
+	element.draggable("enable");
+	TestHelpers.draggable.shouldMove( element, ".draggable('enable')" );
+	equal( element.draggable( "option", "disabled" ), false, "disabled option getter" );
 
-	el.draggable("enable");
-	TestHelpers.draggable.shouldMove(el, ".draggable('enable')");
-	equal(el.draggable("option", "disabled"), false, "disabled option getter");
+	element.draggable("destroy");
+	element.draggable({ disabled: true });
+	TestHelpers.draggable.shouldNotMove( element, ".draggable({ disabled: true })" );
 
-	el.draggable("destroy");
-	el.draggable({ disabled: true });
-	TestHelpers.draggable.shouldNotMove(el, ".draggable({ disabled: true })");
+	element.draggable( "option", "disabled", false );
+	equal(element.draggable( "option", "disabled" ), false, "disabled option setter" );
+	TestHelpers.draggable.shouldMove( element, ".draggable('option', 'disabled', false)" );
 
-	el.draggable("option", "disabled", false);
-	equal(el.draggable("option", "disabled"), false, "disabled option setter");
-	TestHelpers.draggable.shouldMove(el, ".draggable('option', 'disabled', false)");
-
-	expected = $("<div></div>").draggable(),
-	actual = expected.draggable("enable");
-	equal(actual, expected, "enable is chainable");
+	var expected = element.draggable(),
+		actual = expected.draggable("enable");
+	equal( actual, expected, "enable is chainable" );
 });
 
-test("disable", function() {
-	expect(7);
-
-	var expected, actual, el;
-
-	el = $("#draggable2").draggable({ disabled: false });
-	TestHelpers.draggable.shouldMove(el, ".draggable({ disabled: false })");
+test( "disable", function() {
+	expect( 7 );
 
-	el.draggable("disable");
-	TestHelpers.draggable.shouldNotMove(el, ".draggable('disable')");
-	equal(el.draggable("option", "disabled"), true, "disabled option getter");
+	element = $("#draggable2").draggable({ disabled: false });
+	TestHelpers.draggable.shouldMove( element, ".draggable({ disabled: false })" );
 
-	el.draggable("destroy");
+	element.draggable("disable");
+	TestHelpers.draggable.shouldNotMove( element, ".draggable('disable')" );
+	equal( element.draggable( "option", "disabled" ), true, "disabled option getter" );
 
-	el.draggable({ disabled: false });
-	TestHelpers.draggable.shouldMove(el, ".draggable({ disabled: false })");
+	element.draggable("destroy");
+	element.draggable({ disabled: false });
+	TestHelpers.draggable.shouldMove( element, ".draggable({ disabled: false })" );
 
-	el.draggable("option", "disabled", true);
-	equal(el.draggable("option", "disabled"), true, "disabled option setter");
-	TestHelpers.draggable.shouldNotMove(el, ".draggable('option', 'disabled', true)");
+	element.draggable( "option", "disabled", true );
+	equal( element.draggable( "option", "disabled" ), true, "disabled option setter" );
+	TestHelpers.draggable.shouldNotMove( element, ".draggable('option', 'disabled', true)" );
 
-	expected = $("<div></div>").draggable(),
-	actual = expected.draggable("disable");
-	equal(actual, expected, "disable is chainable");
+	var expected = element.draggable(),
+		actual = expected.draggable("disable");
+	equal( actual, expected, "disable is chainable" );
 });
 
-})(jQuery);
+})( jQuery );