1 files changed, 37 insertions, 36 deletions

diff --git a/tests/unit/draggable/methods.js b/tests/unit/draggable/methods.js
index 77ba2434f..8e95dac30 100644
--- a/tests/unit/draggable/methods.js
+++ b/tests/unit/draggable/methods.js
@@ -1,104 +1,105 @@
 define( [
+	"qunit",
 	"jquery",
 	"./helper",
 	"ui/widgets/draggable"
-], function( $, testHelper ) {
+], function( QUnit, $, testHelper ) {
 
 var element;
 
-module( "draggable: methods", {
-	setup: function() {
+QUnit.module( "draggable: methods", {
+	beforeEach: 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() {
+	afterEach: function() {
 		element.remove();
 	}
 } );
 
-test( "init", function() {
-	expect( 5 );
+QUnit.test( "init", function( assert ) {
+	assert.expect( 5 );
 
 	element.draggable();
-	ok( true, ".draggable() called on element" );
+	assert.ok( true, ".draggable() called on element" );
 
 	$( [] ).draggable();
-	ok( true, ".draggable() called on empty collection" );
+	assert.ok( true, ".draggable() called on empty collection" );
 
 	$( "<div></div>" ).draggable();
-	ok( true, ".draggable() called on disconnected DOMElement" );
+	assert.ok( true, ".draggable() called on disconnected DOMElement" );
 
 	element.draggable( "option", "foo" );
-	ok( true, "arbitrary option getter after init" );
+	assert.ok( true, "arbitrary option getter after init" );
 
 	element.draggable( "option", "foo", "bar" );
-	ok( true, "arbitrary option setter after init" );
+	assert.ok( true, "arbitrary option setter after init" );
 } );
 
-test( "destroy", function() {
-	expect( 4 );
+QUnit.test( "destroy", function( assert ) {
+	assert.expect( 4 );
 
 	element.draggable().draggable( "destroy" );
-	ok( true, ".draggable('destroy') called on element" );
+	assert.ok( true, ".draggable('destroy') called on element" );
 
 	$( [] ).draggable().draggable( "destroy" );
-	ok( true, ".draggable('destroy') called on empty collection" );
+	assert.ok( true, ".draggable('destroy') called on empty collection" );
 
 	element.draggable().draggable( "destroy" );
-	ok( true, ".draggable('destroy') called on disconnected DOMElement" );
+	assert.ok( true, ".draggable('destroy') called on disconnected DOMElement" );
 
 	var expected = element.draggable(),
 		actual = expected.draggable( "destroy" );
-	equal( actual, expected, "destroy is chainable" );
+	assert.equal( actual, expected, "destroy is chainable" );
 } );
 
-test( "enable", function() {
-	expect( 11 );
+QUnit.test( "enable", function( assert ) {
+	assert.expect( 11 );
 
 	element.draggable( { disabled: true } );
-	testHelper.shouldNotDrag( element, ".draggable({ disabled: true })" );
+	testHelper.shouldNotDrag( assert, element, ".draggable({ disabled: true })" );
 
 	element.draggable( "enable" );
-	testHelper.shouldMove( element, ".draggable('enable')" );
-	equal( element.draggable( "option", "disabled" ), false, "disabled option getter" );
+	testHelper.shouldMove( assert, element, ".draggable('enable')" );
+	assert.equal( element.draggable( "option", "disabled" ), false, "disabled option getter" );
 
 	element.draggable( "destroy" );
 	element.draggable( { disabled: true } );
-	testHelper.shouldNotDrag( element, ".draggable({ disabled: true })" );
+	testHelper.shouldNotDrag( assert, element, ".draggable({ disabled: true })" );
 
 	element.draggable( "option", "disabled", false );
-	equal( element.draggable( "option", "disabled" ), false, "disabled option setter" );
-	testHelper.shouldMove( element, ".draggable('option', 'disabled', false)" );
+	assert.equal( element.draggable( "option", "disabled" ), false, "disabled option setter" );
+	testHelper.shouldMove( assert, element, ".draggable('option', 'disabled', false)" );
 
 	var expected = element.draggable(),
 		actual = expected.draggable( "enable" );
-	equal( actual, expected, "enable is chainable" );
+	assert.equal( actual, expected, "enable is chainable" );
 } );
 
-test( "disable", function( assert ) {
-	expect( 14 );
+QUnit.test( "disable", function( assert ) {
+	assert.expect( 14 );
 
 	element = $( "#draggable2" ).draggable( { disabled: false } );
-	testHelper.shouldMove( element, ".draggable({ disabled: false })" );
+	testHelper.shouldMove( assert, element, ".draggable({ disabled: false })" );
 
 	element.draggable( "disable" );
-	testHelper.shouldNotDrag( element, ".draggable('disable')" );
-	equal( element.draggable( "option", "disabled" ), true, "disabled option getter" );
+	testHelper.shouldNotDrag( assert, element, ".draggable('disable')" );
+	assert.equal( element.draggable( "option", "disabled" ), true, "disabled option getter" );
 
 	element.draggable( "destroy" );
 	element.draggable( { disabled: false } );
-	testHelper.shouldMove( element, ".draggable({ disabled: false })" );
+	testHelper.shouldMove( assert, element, ".draggable({ disabled: false })" );
 
 	element.draggable( "option", "disabled", true );
-	equal( element.draggable( "option", "disabled" ), true, "disabled option setter" );
-	testHelper.shouldNotDrag( element, ".draggable('option', 'disabled', true)" );
+	assert.equal( element.draggable( "option", "disabled" ), true, "disabled option setter" );
+	testHelper.shouldNotDrag( assert, element, ".draggable('option', 'disabled', true)" );
 
 	assert.lacksClasses( element.draggable( "widget" ), "ui-state-disabled" );
-	ok( !element.draggable( "widget" ).attr( "aria-disabled" ), "element does not get aria-disabled" );
+	assert.ok( !element.draggable( "widget" ).attr( "aria-disabled" ), "element does not get aria-disabled" );
 	assert.hasClasses( element.draggable( "widget" ), "ui-draggable-disabled" );
 
 	var expected = element.draggable(),
 		actual = expected.draggable( "disable" );
-	equal( actual, expected, "disable is chainable" );
+	assert.equal( actual, expected, "disable is chainable" );
 } );
 
 } );