Sortable: Shift to use no globals

1 files changed, 106 insertions, 105 deletions

diff --git a/tests/unit/sortable/events.js b/tests/unit/sortable/events.js
index d2416fbc4..4973abef0 100644
--- a/tests/unit/sortable/events.js
+++ b/tests/unit/sortable/events.js
@@ -1,14 +1,15 @@
 define( [
+	"qunit",
 	"jquery",
 	"./helper",
 	"ui/widgets/sortable",
 	"ui/widgets/draggable"
-], function( $, testHelper ) {
+], function( QUnit, $, testHelper ) {
 
-module( "sortable: events" );
+QUnit.module( "sortable: events" );
 
-test( "start", function() {
-	expect( 7 );
+QUnit.test( "start", function( assert ) {
+	assert.expect( 7 );
 
 	var hash;
 	$( "#sortable" ).sortable( {
@@ -19,19 +20,19 @@ test( "start", function() {
 		dy: 10
 	} );
 
-	ok( hash, "start event triggered" );
-	ok( hash.helper, "UI hash includes: helper" );
-	ok( hash.placeholder, "UI hash includes: placeholder" );
-	ok( hash.item, "UI hash includes: item" );
-	ok( !hash.sender, "UI hash does not include: sender" );
+	assert.ok( hash, "start event triggered" );
+	assert.ok( hash.helper, "UI hash includes: helper" );
+	assert.ok( hash.placeholder, "UI hash includes: placeholder" );
+	assert.ok( hash.item, "UI hash includes: item" );
+	assert.ok( !hash.sender, "UI hash does not include: sender" );
 
 	// Todo: see if these events should actually have sane values in them
-	ok( "position" in hash, "UI hash includes: position" );
-	ok( "offset" in hash, "UI hash includes: offset" );
+	assert.ok( "position" in hash, "UI hash includes: position" );
+	assert.ok( "offset" in hash, "UI hash includes: offset" );
 } );
 
-test( "sort", function() {
-	expect( 7 );
+QUnit.test( "sort", function( assert ) {
+	assert.expect( 7 );
 
 	var hash;
 	$( "#sortable" ).sortable( {
@@ -42,18 +43,18 @@ test( "sort", function() {
 		dy: 10
 	} );
 
-	ok( hash, "sort event triggered" );
-	ok( hash.helper, "UI hash includes: helper" );
-	ok( hash.placeholder, "UI hash includes: placeholder" );
-	ok( hash.position && ( "top" in hash.position && "left" in hash.position ), "UI hash includes: position" );
-	ok( hash.offset && ( hash.offset.top && hash.offset.left ), "UI hash includes: offset" );
-	ok( hash.item, "UI hash includes: item" );
-	ok( !hash.sender, "UI hash does not include: sender" );
+	assert.ok( hash, "sort event triggered" );
+	assert.ok( hash.helper, "UI hash includes: helper" );
+	assert.ok( hash.placeholder, "UI hash includes: placeholder" );
+	assert.ok( hash.position && ( "top" in hash.position && "left" in hash.position ), "UI hash includes: position" );
+	assert.ok( hash.offset && ( hash.offset.top && hash.offset.left ), "UI hash includes: offset" );
+	assert.ok( hash.item, "UI hash includes: item" );
+	assert.ok( !hash.sender, "UI hash does not include: sender" );
 
 } );
 
-test( "change", function() {
-	expect( 8 );
+QUnit.test( "change", function( assert ) {
+	assert.expect( 8 );
 
 	var hash;
 	$( "#sortable" ).sortable( {
@@ -65,7 +66,7 @@ test( "change", function() {
 		dy: 1
 	} );
 
-	ok( !hash, "1px drag, change event should not be triggered" );
+	assert.ok( !hash, "1px drag, change event should not be triggered" );
 
 	$( "#sortable" ).sortable( {
 		change: function( e, ui ) {
@@ -75,18 +76,18 @@ test( "change", function() {
 		dy: 22
 	} );
 
-	ok( hash, "change event triggered" );
-	ok( hash.helper, "UI hash includes: helper" );
-	ok( hash.placeholder, "UI hash includes: placeholder" );
-	ok( hash.position && ( "top" in hash.position && "left" in hash.position ), "UI hash includes: position" );
-	ok( hash.offset && ( hash.offset.top && hash.offset.left ), "UI hash includes: offset" );
-	ok( hash.item, "UI hash includes: item" );
-	ok( !hash.sender, "UI hash does not include: sender" );
+	assert.ok( hash, "change event triggered" );
+	assert.ok( hash.helper, "UI hash includes: helper" );
+	assert.ok( hash.placeholder, "UI hash includes: placeholder" );
+	assert.ok( hash.position && ( "top" in hash.position && "left" in hash.position ), "UI hash includes: position" );
+	assert.ok( hash.offset && ( hash.offset.top && hash.offset.left ), "UI hash includes: offset" );
+	assert.ok( hash.item, "UI hash includes: item" );
+	assert.ok( !hash.sender, "UI hash does not include: sender" );
 
 } );
 
-test( "beforeStop", function() {
-	expect( 7 );
+QUnit.test( "beforeStop", function( assert ) {
+	assert.expect( 7 );
 
 	var hash;
 	$( "#sortable" ).sortable( {
@@ -97,18 +98,18 @@ test( "beforeStop", function() {
 		dy: 20
 	} );
 
-	ok( hash, "beforeStop event triggered" );
-	ok( hash.helper, "UI hash includes: helper" );
-	ok( hash.placeholder, "UI hash includes: placeholder" );
-	ok( hash.position && ( "top" in hash.position && "left" in hash.position ), "UI hash includes: position" );
-	ok( hash.offset && ( hash.offset.top && hash.offset.left ), "UI hash includes: offset" );
-	ok( hash.item, "UI hash includes: item" );
-	ok( !hash.sender, "UI hash does not include: sender" );
+	assert.ok( hash, "beforeStop event triggered" );
+	assert.ok( hash.helper, "UI hash includes: helper" );
+	assert.ok( hash.placeholder, "UI hash includes: placeholder" );
+	assert.ok( hash.position && ( "top" in hash.position && "left" in hash.position ), "UI hash includes: position" );
+	assert.ok( hash.offset && ( hash.offset.top && hash.offset.left ), "UI hash includes: offset" );
+	assert.ok( hash.item, "UI hash includes: item" );
+	assert.ok( !hash.sender, "UI hash does not include: sender" );
 
 } );
 
-test( "stop", function() {
-	expect( 7 );
+QUnit.test( "stop", function( assert ) {
+	assert.expect( 7 );
 
 	var hash;
 	$( "#sortable" ).sortable( {
@@ -119,18 +120,18 @@ test( "stop", function() {
 		dy: 20
 	} );
 
-	ok( hash, "stop event triggered" );
-	ok( !hash.helper, "UI should not include: helper" );
-	ok( hash.placeholder, "UI hash includes: placeholder" );
-	ok( hash.position && ( "top" in hash.position && "left" in hash.position ), "UI hash includes: position" );
-	ok( hash.offset && ( hash.offset.top && hash.offset.left ), "UI hash includes: offset" );
-	ok( hash.item, "UI hash includes: item" );
-	ok( !hash.sender, "UI hash does not include: sender" );
+	assert.ok( hash, "stop event triggered" );
+	assert.ok( !hash.helper, "UI should not include: helper" );
+	assert.ok( hash.placeholder, "UI hash includes: placeholder" );
+	assert.ok( hash.position && ( "top" in hash.position && "left" in hash.position ), "UI hash includes: position" );
+	assert.ok( hash.offset && ( hash.offset.top && hash.offset.left ), "UI hash includes: offset" );
+	assert.ok( hash.item, "UI hash includes: item" );
+	assert.ok( !hash.sender, "UI hash does not include: sender" );
 
 } );
 
-test( "update", function() {
-	expect( 8 );
+QUnit.test( "update", function( assert ) {
+	assert.expect( 8 );
 
 	var hash;
 	$( "#sortable" ).sortable( {
@@ -142,7 +143,7 @@ test( "update", function() {
 		dy: 1
 	} );
 
-	ok( !hash, "1px drag, update event should not be triggered" );
+	assert.ok( !hash, "1px drag, update event should not be triggered" );
 
 	$( "#sortable" ).sortable( {
 		update: function( e, ui ) {
@@ -152,18 +153,18 @@ test( "update", function() {
 		dy: 22
 	} );
 
-	ok( hash, "update event triggered" );
-	ok( !hash.helper, "UI hash should not include: helper" );
-	ok( hash.placeholder, "UI hash includes: placeholder" );
-	ok( hash.position && ( "top" in hash.position && "left" in hash.position ), "UI hash includes: position" );
-	ok( hash.offset && ( hash.offset.top && hash.offset.left ), "UI hash includes: offset" );
-	ok( hash.item, "UI hash includes: item" );
-	ok( !hash.sender, "UI hash does not include: sender" );
+	assert.ok( hash, "update event triggered" );
+	assert.ok( !hash.helper, "UI hash should not include: helper" );
+	assert.ok( hash.placeholder, "UI hash includes: placeholder" );
+	assert.ok( hash.position && ( "top" in hash.position && "left" in hash.position ), "UI hash includes: position" );
+	assert.ok( hash.offset && ( hash.offset.top && hash.offset.left ), "UI hash includes: offset" );
+	assert.ok( hash.item, "UI hash includes: item" );
+	assert.ok( !hash.sender, "UI hash does not include: sender" );
 
 } );
 
-test( "#3019: Stop fires too early", function() {
-	expect( 2 );
+QUnit.test( "#3019: Stop fires too early", function( assert ) {
+	assert.expect( 2 );
 
 	var helper = null,
 		el = $( "#sortable" ).sortable( {
@@ -172,13 +173,13 @@ test( "#3019: Stop fires too early", function() {
 			}
 		} );
 
-	testHelper.sort( $( "li", el )[ 0 ], 0, 44, 2, "Dragging the sortable" );
-	equal( helper, null, "helper should be false" );
+	testHelper.sort( assert, $( "li", el )[ 0 ], 0, 44, 2, "Dragging the sortable" );
+	assert.equal( helper, null, "helper should be false" );
 
 } );
 
-test( "#4752: link event firing on sortable with connect list", function() {
-	expect( 10 );
+QUnit.test( "#4752: link event firing on sortable with connect list", function( assert ) {
+	assert.expect( 10 );
 
 	var fired = {},
 		hasFired = function( type ) { return ( type in fired ) && ( true === fired[ type ] ); };
@@ -203,28 +204,28 @@ test( "#4752: link event firing on sortable with connect list", function() {
 	} );
 
 	$( "#sortable li:eq(0)" ).simulate( "click" );
-	ok( !hasFired( "change" ), "Click only, change event should not have fired" );
-	ok( hasFired( "click" ), "Click event should have fired" );
+	assert.ok( !hasFired( "change" ), "Click only, change event should not have fired" );
+	assert.ok( hasFired( "click" ), "Click event should have fired" );
 
 	// Drag an item within the first list
 	fired = {};
 	$( "#sortable li:eq(0)" ).simulate( "drag", { dx: 0, dy: 40 } );
-	ok( hasFired( "change" ), "40px drag, change event should have fired" );
-	ok( !hasFired( "receive" ), "Receive event should not have fired" );
-	ok( !hasFired( "remove" ), "Remove event should not have fired" );
-	ok( !hasFired( "click" ), "Click event should not have fired" );
+	assert.ok( hasFired( "change" ), "40px drag, change event should have fired" );
+	assert.ok( !hasFired( "receive" ), "Receive event should not have fired" );
+	assert.ok( !hasFired( "remove" ), "Remove event should not have fired" );
+	assert.ok( !hasFired( "click" ), "Click event should not have fired" );
 
 	// Drag an item from the first list to the second, connected list
 	fired = {};
 	$( "#sortable li:eq(0)" ).simulate( "drag", { dx: 0, dy: 150 } );
-	ok( hasFired( "change" ), "150px drag, change event should have fired" );
-	ok( hasFired( "receive" ), "Receive event should have fired" );
-	ok( hasFired( "remove" ), "Remove event should have fired" );
-	ok( !hasFired( "click" ), "Click event should not have fired" );
+	assert.ok( hasFired( "change" ), "150px drag, change event should have fired" );
+	assert.ok( hasFired( "receive" ), "Receive event should have fired" );
+	assert.ok( hasFired( "remove" ), "Remove event should have fired" );
+	assert.ok( !hasFired( "click" ), "Click event should not have fired" );
 } );
 
 /*
-test("receive", function() {
+Test("receive", function() {
 	ok(false, "missing test - untested code is broken code.");
 });
 
@@ -233,8 +234,8 @@ test("remove", function() {
 });
 */
 
-test( "over", function() {
-	expect( 8 );
+QUnit.test( "over", function( assert ) {
+	assert.expect( 8 );
 
 	var hash,
 		overCount = 0;
@@ -248,20 +249,20 @@ test( "over", function() {
 		dy: 20
 	} );
 
-	ok( hash, "over event triggered" );
-	ok( hash.helper, "UI includes: helper" );
-	ok( hash.placeholder, "UI hash includes: placeholder" );
-	ok( hash.position && ( "top" in hash.position && "left" in hash.position ), "UI hash includes: position" );
-	ok( hash.offset && ( hash.offset.top && hash.offset.left ), "UI hash includes: offset" );
-	ok( hash.item, "UI hash includes: item" );
-	ok( hash.sender, "UI hash includes: sender" );
-	equal( overCount, 1, "over fires only once" );
+	assert.ok( hash, "over event triggered" );
+	assert.ok( hash.helper, "UI includes: helper" );
+	assert.ok( hash.placeholder, "UI hash includes: placeholder" );
+	assert.ok( hash.position && ( "top" in hash.position && "left" in hash.position ), "UI hash includes: position" );
+	assert.ok( hash.offset && ( hash.offset.top && hash.offset.left ), "UI hash includes: offset" );
+	assert.ok( hash.item, "UI hash includes: item" );
+	assert.ok( hash.sender, "UI hash includes: sender" );
+	assert.equal( overCount, 1, "over fires only once" );
 } );
 
 // http://bugs.jqueryui.com/ticket/9335
 // Sortable: over & out events does not consistently fire
-test( "over, fires with draggable connected to sortable", function() {
-	expect( 3 );
+QUnit.test( "over, fires with draggable connected to sortable", function( assert ) {
+	assert.expect( 3 );
 
 	var hash,
 		overCount = 0,
@@ -282,13 +283,13 @@ test( "over, fires with draggable connected to sortable", function() {
 		dy: -20
 	} );
 
-	ok( hash, "over event triggered" );
-	ok( !hash.sender, "UI should not include: sender" );
-	equal( overCount, 1, "over fires only once" );
+	assert.ok( hash, "over event triggered" );
+	assert.ok( !hash.sender, "UI should not include: sender" );
+	assert.equal( overCount, 1, "over fires only once" );
 } );
 
-test( "over, with connected sortable", function() {
-	expect( 3 );
+QUnit.test( "over, with connected sortable", function( assert ) {
+	assert.expect( 3 );
 
 	var hash,
 		overCount = 0;
@@ -304,19 +305,19 @@ test( "over, with connected sortable", function() {
 		dy: 102
 	} );
 
-	ok( hash, "over event triggered" );
-	equal( hash.sender[ 0 ], $( " #sortable" )[ 0 ], "UI includes: sender" );
-	equal( overCount, 1, "over fires only once" );
+	assert.ok( hash, "over event triggered" );
+	assert.equal( hash.sender[ 0 ], $( " #sortable" )[ 0 ], "UI includes: sender" );
+	assert.equal( overCount, 1, "over fires only once" );
 } );
 
 /*
-test("out", function() {
+Test("out", function() {
 	ok(false, "missing test - untested code is broken code.");
 });
 */
 
-test( "out, with connected sortable", function() {
-	expect( 2 );
+QUnit.test( "out, with connected sortable", function( assert ) {
+	assert.expect( 2 );
 
 	var hash,
 		outCount = 0;
@@ -332,12 +333,12 @@ test( "out, with connected sortable", function() {
 		dy: 40
 	} );
 
-	ok( hash, "out event triggered" );
-	equal( outCount, 1, "out fires only once" );
+	assert.ok( hash, "out event triggered" );
+	assert.equal( outCount, 1, "out fires only once" );
 } );
 
-test( "repeated out & over between connected sortables", function() {
-	expect( 2 );
+QUnit.test( "repeated out & over between connected sortables", function( assert ) {
+	assert.expect( 2 );
 
 	var outCount = 0,
 		overCount = 0;
@@ -362,12 +363,12 @@ test( "repeated out & over between connected sortables", function() {
 		dy: -40
 	} );
 
-	equal( outCount, 2, "out fires twice" );
-	equal( overCount, 4, "over fires four times" );
+	assert.equal( outCount, 2, "out fires twice" );
+	assert.equal( overCount, 4, "over fires four times" );
 } );
 
 /*
-test("activate", function() {
+Test("activate", function() {
 	ok(false, "missing test - untested code is broken code.");
 });