Draggable Tests: Add test coverage for supported options

1 files changed, 647 insertions, 83 deletions

diff --git a/tests/unit/draggable/draggable_options.js b/tests/unit/draggable/draggable_options.js
index 8496d6182..0ab41b1f1 100644
--- a/tests/unit/draggable/draggable_options.js
+++ b/tests/unit/draggable/draggable_options.js
@@ -5,23 +5,8 @@
 
 module("draggable: options");
 
-test("{ addClasses: true }, default", function() {
-	expect( 1 );
-	var el = $("<div></div>").draggable({ addClasses: true });
-	ok(el.is(".ui-draggable"), "'ui-draggable' class added");
-
-	el.draggable("destroy");
-});
-
-test("{ addClasses: false }", function() {
-	expect( 1 );
-	var el = $("<div></div>").draggable({ addClasses: false });
-	ok(!el.is(".ui-draggable"), "'ui-draggable' class not added");
-
-	el.draggable("destroy");
-});
-
-test("{ appendTo: 'parent' }, default", function() {
+// TODO: This doesn't actually test whether append happened, possibly remove
+test("{ appendTo: 'parent' }, default, no clone", function() {
 	expect( 2 );
 	var el = $("#draggable2").draggable({ appendTo: "parent" });
 	TestHelpers.draggable.shouldMove(el);
@@ -31,16 +16,19 @@ test("{ appendTo: 'parent' }, default", function() {
 
 });
 
-test("{ appendTo: Element }", function() {
+// TODO: This doesn't actually test whether append happened, possibly remove
+test("{ appendTo: Element }, no clone", function() {
 	expect( 2 );
-	var el = $("#draggable2").draggable({ appendTo: $("#draggable2").parent()[0] });
+	var el = $("#draggable2").draggable({appendTo: $("#draggable2").parent()[0] });
+
 	TestHelpers.draggable.shouldMove(el);
 
 	el = $("#draggable1").draggable({ appendTo: $("#draggable2").parent()[0] });
 	TestHelpers.draggable.shouldMove(el);
 });
 
-test("{ appendTo: Selector }", function() {
+// TODO: This doesn't actually test whether append happened, possibly remove
+test("{ appendTo: Selector }, no clone", function() {
 	expect( 2 );
 	var el = $("#draggable2").draggable({ appendTo: "#main" });
 	TestHelpers.draggable.shouldMove(el);
@@ -49,6 +37,83 @@ test("{ appendTo: Selector }", function() {
 	TestHelpers.draggable.shouldMove(el);
 });
 
+test("{ appendTo: 'parent' }, default", function() {
+
+	expect(2);
+
+	var el = $("#draggable1").draggable();
+
+	TestHelpers.draggable.trackAppendedParent(el);
+
+	equal( el.draggable( "option", "appendTo" ), "parent" );
+
+	TestHelpers.draggable.move(el, 1, 1);
+	equal( el.data("last_dragged_parent"), $("#qunit-fixture")[0] );
+
+});
+
+test("{ appendTo: Element }", function() {
+
+	expect(1);
+
+	var appendTo = $("#draggable2").parent()[0],
+		el = $("#draggable1").draggable({ appendTo: appendTo });
+
+	TestHelpers.draggable.trackAppendedParent(el);
+
+	TestHelpers.draggable.move(el, 1, 1);
+	equal( el.data("last_dragged_parent"), appendTo );
+
+});
+
+test("{ appendTo: jQuery }", function() {
+
+	expect(1);
+
+	var appendTo = $("#draggable2").parent(),
+		el = $("#draggable1").draggable({ appendTo: appendTo });
+
+	TestHelpers.draggable.trackAppendedParent(el);
+
+	TestHelpers.draggable.move(el, 1, 1);
+	equal( el.data("last_dragged_parent"), appendTo[0] );
+
+});
+test("{ appendTo: Selector }", function() {
+
+	expect(1);
+
+
+	var appendTo = "#main",
+		el = $("#draggable1").draggable({ appendTo: appendTo });
+
+	TestHelpers.draggable.trackAppendedParent(el);
+
+	TestHelpers.draggable.move(el, 1, 1);
+	equal( el.data("last_dragged_parent"), $(appendTo)[0] );
+
+});
+
+
+test("appendTo, default, switching after initialization", function() {
+
+	expect(2);
+
+	var el = $("#draggable1").draggable({ helper : "clone" });
+
+	TestHelpers.draggable.trackAppendedParent(el);
+
+	// Move and make sure el was appended to fixture
+	TestHelpers.draggable.move(el, 1, 1);
+	equal( el.data("last_dragged_parent"), $("#qunit-fixture")[0] );
+
+	// Move and make sure el was appended to main
+	el.draggable( "option", "appendTo", $("#main") );
+	TestHelpers.draggable.move(el, 2, 2);
+	equal( el.data("last_dragged_parent"), $("#main")[0] );
+
+});
+
 test("{ axis: false }, default", function() {
 	expect( 1 );
 	var el = $("#draggable2").draggable({ axis: false });
@@ -87,6 +152,26 @@ test("{ axis: ? }, unexpected", function() {
 	});
 });
 
+test("axis, default, switching after initialization", function() {
+
+	expect(3);
+
+	var el;
+
+	// Any direction
+	el = $("#draggable1").draggable({ axis : false });
+	TestHelpers.draggable.testDrag(el, el, 50, 50, 50, 50);
+
+	// Only horizontal
+	el.draggable("option", "axis", "x");
+	TestHelpers.draggable.testDrag(el, el, 50, 50, 50, 0);
+
+	// Vertical only
+	el.draggable("option", "axis", "y");
+	TestHelpers.draggable.testDrag(el, el, 50, 50, 0, 50);
+
+});
+
 test("{ cancel: 'input,textarea,button,select,option' }, default", function() {
 	expect( 2 );
 
@@ -114,7 +199,9 @@ test("{ cancel: 'span' }", function() {
 	TestHelpers.draggable.testDrag(el, "#draggable2 span", 50, 50, 0, 0);
 });
 
-test("{ cancel: ? }, unexpected", function() {
+test( "{ cancel: ? }, unexpected", function() {
+	expect( 6 );
+
 	var el,
 		unexpected = {
 			"true": true,
@@ -122,40 +209,75 @@ test("{ cancel: ? }, unexpected", function() {
 			"{}": {},
 			"[]": [],
 			"null": null,
-			"undefined": undefined,
-			"function() {return '';}": function() {return "";},
-			"function() {return true;}": function() {return true;},
-			"function() {return false;}": function() {return false;}
+			"undefined": undefined
 		};
 
-	expect( 9 );
-
-	$.each(unexpected, function(key, val) {
+	$.each( unexpected, function( key, val ) {
 		el = $("#draggable2").draggable({ cancel: val });
-		TestHelpers.draggable.shouldMove(el, "cancel: " + key);
+		TestHelpers.draggable.shouldMove( el, "cancel: " + key );
 		el.draggable("destroy");
 	});
 });
 
-/*
-test("{ containment: false }, default", function() {
-	expect( 1 );
+/**
+test("{ cancel: Selectors }, matching parent selector", function() {
+
+	expect( 5 );
+
+	var el = $("#draggable2").draggable({ cancel: "span a" });
+
+	$("#qunit-fixture").append( "<span id='wrapping'><a></a></span>" );
+
+	el.find( "span" ).append( "<a>" );
+
+	$("#wrapping a").append( el );
+
+	TestHelpers.draggable.testDrag(el, "#draggable2 span", 50, 50, 50, 50, "drag span child");
+	TestHelpers.draggable.shouldNotMove( $("#draggable2 span a") );
+	TestHelpers.draggable.shouldNotMove( $("#wrapping a") );
+
+	$("#draggable2").draggable( "option", "cancel", "span > a" );
+	$("#draggable2").find( "a" ).append( "<a>" );
+
+
+	TestHelpers.draggable.testDrag(el, $("#draggable2 span a").last(), 50, 50, 50, 50, "drag span child");
+	TestHelpers.draggable.shouldNotMove( $("#draggable2 span a").first() );
 
-	ok(false, "missing test - untested code is broken code");
 });
+*/
+
+test("cancel, default, switching after initialization", function() {
+	expect( 3 );
+
+	$("<div id='draggable-option-cancel-default'><input type='text'></div>").appendTo("#main");
+
+	var input = $("#draggable-option-cancel-default input"),
+		el = $("#draggable-option-cancel-default").draggable();
+
+	TestHelpers.draggable.testDrag(el, input, 50, 50, 0, 0);
+
+	el.draggable("option", "cancel", "textarea" );
+	TestHelpers.draggable.testDrag(el, input, 50, 50, 50, 50);
+
+	el.draggable("option", "cancel", "input" );
+	TestHelpers.draggable.testDrag(el, input, 50, 50, 0, 0);
 
-test("{ containment: Element }", function() {
+});
+
+/*
+
+test("{ connectToSortable: selector }, default", function() {
 	expect( 1 );
 
 	ok(false, "missing test - untested code is broken code");
 });
 */
 
-test("{ containment: 'parent' }, relative", function() {
+test( "{ containment: Element }", function() {
 	expect( 1 );
 
 	var offsetAfter,
-		el = $("#draggable1").draggable({ containment: "parent" }),
+		el = $( "#draggable1" ).draggable({ containment: $( "#draggable1" ).parent()[ 0 ] }),
 		p = el.parent(),
 		po = p.offset(),
 		expected = {
@@ -171,11 +293,11 @@ test("{ containment: 'parent' }, relative", function() {
 	deepEqual(offsetAfter, expected, "compare offset to parent");
 });
 
-test("{ containment: 'parent' }, absolute", function() {
+test( "{ containment: Selector }", function() {
 	expect( 1 );
 
 	var offsetAfter,
-		el = $("#draggable2").draggable({ containment: "parent" }),
+		el = $( "#draggable1" ).draggable({ containment: $( "#qunit-fixture" ) }),
 		p = el.parent(),
 		po = p.offset(),
 		expected = {
@@ -191,31 +313,75 @@ test("{ containment: 'parent' }, absolute", function() {
 	deepEqual(offsetAfter, expected, "compare offset to parent");
 });
 
-/*
-test("{ containment: 'document' }", function() {
+test( "{ containment: [x1, y1, x2, y2] }", function() {
 	expect( 1 );
 
-	ok(false, "missing test - untested code is broken code");
+	var el = $( "#draggable1" ).draggable(),
+		eo = el.offset();
+
+	el.draggable( "option", "containment", [ eo.left, eo.top, eo.left + el.width() + 5, eo.left + el.width() + 5 ] );
+
+	TestHelpers.draggable.testDrag( el, el, -100, -100, 0, 0 );
 });
 
-test("{ containment: 'window' }", function() {
+test("{ containment: 'parent' }, relative", function() {
 	expect( 1 );
 
-	ok(false, "missing test - untested code is broken code");
+	var offsetAfter,
+		el = $("#draggable1").draggable({ containment: "parent" }),
+		p = el.parent(),
+		po = p.offset(),
+		expected = {
+			left: po.left + TestHelpers.draggable.border(p, "left") + TestHelpers.draggable.margin(el, "left"),
+			top: po.top + TestHelpers.draggable.border(p, "top") + TestHelpers.draggable.margin(el, "top")
+		};
+
+	el.simulate( "drag", {
+		dx: -100,
+		dy: -100
+	});
+	offsetAfter = el.offset();
+	deepEqual(offsetAfter, expected, "compare offset to parent");
 });
 
-test("{ containment: Selector }", function() {
+test("{ containment: 'parent' }, absolute", function() {
 	expect( 1 );
 
-	ok(false, "missing test - untested code is broken code");
+	var offsetAfter,
+		el = $("#draggable2").draggable({ containment: "parent" }),
+		p = el.parent(),
+		po = p.offset(),
+		expected = {
+			left: po.left + TestHelpers.draggable.border(p, "left") + TestHelpers.draggable.margin(el, "left"),
+			top: po.top + TestHelpers.draggable.border(p, "top") + TestHelpers.draggable.margin(el, "top")
+		};
+
+	el.simulate( "drag", {
+		dx: -100,
+		dy: -100
+	});
+	offsetAfter = el.offset();
+	deepEqual(offsetAfter, expected, "compare offset to parent");
 });
 
-test("{ containment: [x1, y1, x2, y2] }", function() {
-	expect( 1 );
+test("containment, default, switching after initialization", function() {
+	expect( 2 );
+
+	var el = $("#draggable1").draggable({ containment: false });
+
+	TestHelpers.draggable.testDrag(el, el, -100, -100, -100, -100);
+
+	el.draggable( "option", "containment", "parent" )
+		.css({top:0,left:0})
+		.appendTo( $("#main") );
+
+	TestHelpers.draggable.testDrag(el, el, -100, -100, 0, 0);
+
+	// TODO: Switching back to false does not update to false
+	// el.draggable( "option", "containment", false );
+	// TestHelpers.draggable.testDrag(el, el, -100, -100, -100, -100);
 
-	ok(false, "missing test - untested code is broken code");
 });
-*/
 
 test("{ cursor: 'auto' }, default", function() {
 	function getCursor() { return $("#draggable2").css("cursor"); }
@@ -270,6 +436,27 @@ test("{ cursor: 'move' }", function() {
 
 });
 
+test("cursor, default, switching after initialization", function() {
+
+	expect(3);
+
+	var el = $("#draggable1").draggable();
+
+	TestHelpers.draggable.trackMouseCss( el );
+
+	TestHelpers.draggable.move( el, 1, 1 );
+	equal( el.data("last_dragged_cursor"), "auto" );
+
+	el.draggable( "option", "cursor", "move" );
+	TestHelpers.draggable.move( el, 1, 1 );
+	equal( el.data("last_dragged_cursor"), "move" );
+
+	el.draggable( "option", "cursor", "ns-resize" );
+	TestHelpers.draggable.move( el, 1, 1 );
+	equal( el.data("last_dragged_cursor"), "ns-resize" );
+
+});
+
 test( "cursorAt", function() {
 	expect( 24 );
 
@@ -311,15 +498,67 @@ test( "cursorAt", function() {
 	});
 });
 
-test("{ distance: 10 }", function() {
+test( "cursorAt, switching after initialization", function() {
+
+	expect( 24 );
+
+	var deltaX = -3,
+		deltaY = -3,
+		tests = {
+			"false": { cursorAt : false },
+			"{ left: -5, top: -5 }": { x: -5, y: -5, cursorAt : { left: -5, top: -5 } },
+			"[ 10, 20 ]": { x: 10, y: 20, cursorAt : [ 10, 20 ] },
+			"'10 20'": { x: 10, y: 20, cursorAt : "10 20" },
+			"{ left: 20, top: 40 }": { x: 20, y: 40, cursorAt : { left: 20, top: 40 } },
+			"{ right: 10, bottom: 20 }": { x: 10, y: 20, cursorAt : { right: 10, bottom: 20 } }
+		};
+
+	$.each( tests, function( testName, testData ) {
+		$.each( [ "relative", "absolute" ], function( i, position ) {
+			var el = $( "#draggable" + ( i + 1 ) );
+
+			el.draggable({
+					drag: function( event, ui ) {
+						if( !testData.cursorAt ) {
+							equal( ui.position.left - ui.originalPosition.left, deltaX, testName + " " + position + " left" );
+							equal( ui.position.top - ui.originalPosition.top, deltaY, testName + " " + position + " top" );
+						} else if( testData.cursorAt.right ) {
+							equal( ui.helper.width() - ( event.clientX - ui.offset.left ), testData.x - TestHelpers.draggable.unreliableOffset, testName + " " + position + " left" );
+							equal( ui.helper.height() - ( event.clientY - ui.offset.top ), testData.y - TestHelpers.draggable.unreliableOffset, testName + " " +position + " top" );
+						} else {
+							equal( event.clientX - ui.offset.left, testData.x + TestHelpers.draggable.unreliableOffset, testName + " " + position + " left" );
+							equal( event.clientY - ui.offset.top, testData.y + TestHelpers.draggable.unreliableOffset, testName + " " + position + " top" );
+						}
+					}
+			});
+
+			el.draggable( "option", "cursorAt", false );
+			el.draggable( "option", "cursorAt", testData.cursorAt );
+
+			el.simulate( "drag", {
+				moves: 1,
+				dx: deltaX,
+				dy: deltaY
+			});
+		});
+	});
+
+});
+
+
+test( "disabled", function() {
+
 	expect( 3 );
 
-	var el = $("#draggable2").draggable({ distance: 10 });
-	TestHelpers.draggable.testDrag(el, el, -9, -9, 0, 0, "distance not met");
+	var el = $("#draggable1").draggable();
 
-	TestHelpers.draggable.testDrag(el, el, -10, -10, -10, -10, "distance met");
+	TestHelpers.draggable.shouldMove(el);
 
-	TestHelpers.draggable.testDrag(el, el, 9, 9, 0, 0, "distance not met");
+	el.draggable( "option", "disabled", true );
+	TestHelpers.draggable.shouldNotMove(el);
+
+	el.draggable( "option", "disabled", false );
+	TestHelpers.draggable.shouldMove(el);
 
 });
 
@@ -339,6 +578,22 @@ test("{ grid: [50, 50] }, absolute", function() {
 	TestHelpers.draggable.testDrag(el, el, 26, 25, 50, 50);
 });
 
+test("grid, switching after initialization", function() {
+
+	expect( 4 );
+
+	var el = $("#draggable1").draggable();
+	// Forward
+	TestHelpers.draggable.testDrag(el, el, 24, 24, 24, 24);
+	TestHelpers.draggable.testDrag(el, el, 0, 0, 0, 0);
+
+	el.draggable( "option", "grid", [50,50] );
+
+	TestHelpers.draggable.testDrag(el, el, 24, 24, 0, 0);
+	TestHelpers.draggable.testDrag(el, el, 26, 25, 50, 50);
+
+});
+
 test("{ handle: 'span' }", function() {
 	expect( 2 );
 
@@ -348,6 +603,65 @@ test("{ handle: 'span' }", function() {
 	TestHelpers.draggable.shouldNotMove(el, "drag element");
 });
 
+/*
+test("{ handle: Selectors }, matching parent selector", function() {
+
+	expect( 4 );
+
+	var el = $("#draggable2").draggable({ handle: "span a" });
+
+	$("#qunit-fixture").append( "<span id='wrapping'><a></a></span>" );
+
+	el.find( "span" ).append( "<a>" );
+
+	$("#wrapping a").append( el );
+
+	TestHelpers.draggable.testDrag(el, "#draggable2 span a", 50, 50, 50, 50, "drag span child");
+	TestHelpers.draggable.shouldNotMove( $("#wrapping a") );
+
+	$("#draggable2").draggable( "option", "handle", "span > a" );
+	$("#draggable2").find( "a" ).append( "<a>" );
+
+	TestHelpers.draggable.testDrag(el, $("#draggable2 span a").first(), 50, 50, 50, 50, "drag span child");
+	TestHelpers.draggable.shouldNotMove( $("#draggable2 span a").last() );
+
+});
+*/
+
+test("handle, default, switching after initialization", function() {
+	expect( 6 );
+
+	var el = $("#draggable2").draggable();
+
+	TestHelpers.draggable.testDrag(el, el, 50, 50, 50, 50);
+	TestHelpers.draggable.testDrag(el, "#draggable2 span", 100, 100, 100, 100);
+
+	// Switch
+	el.draggable( "option", "handle", "span" );
+	TestHelpers.draggable.testDrag(el, el, 50, 50, 0, 0);
+	TestHelpers.draggable.testDrag(el, "#draggable2 span", 100, 100, 100, 100);
+
+	// And back
+	el.draggable( "option", "handle", false );
+	TestHelpers.draggable.testDrag(el, el, 50, 50, 50, 50);
+	TestHelpers.draggable.testDrag(el, "#draggable2 span", 100, 100, 100, 100);
+
+});
+
+test("helper, default, switching after initialization", function() {
+	expect( 3 );
+
+	var el = $("#draggable1").draggable();
+	TestHelpers.draggable.shouldMove(el);
+
+	el.draggable( "option", "helper", "clone" );
+	TestHelpers.draggable.shouldNotMove(el);
+
+	el.draggable( "option", "helper", "original" );
+	TestHelpers.draggable.shouldMove(el);
+
+});
+
 test("{ helper: 'clone' }, relative", function() {
 	expect( 1 );
 
@@ -701,8 +1015,267 @@ test("{ opacity: 0.5 }", function() {
 
 });
 
-test("{ zIndex: 10 }", function() {
+test("opacity, default, switching after initialization", function() {
+
+	expect(3);
+
+	var opacity = null,
+		el = $("#draggable2").draggable({
+			start: function() {
+				opacity = $(this).css("opacity");
+			}
+		});
+
+	TestHelpers.draggable.move( el, 1, 1 );
+	equal( opacity, 1 );
+
+	el.draggable( "option", "opacity", 0.5 );
+	TestHelpers.draggable.move( el, 2, 1 );
+	equal( opacity, 0.5 );
+
+	el.draggable( "option", "opacity", false );
+	TestHelpers.draggable.move( el, 3, 1 );
+	equal( opacity, 1 );
+
+});
+
+asyncTest( "revert and revertDuration", function() {
+	expect( 4 );
+
+	var el = $( "#draggable2" ).draggable({
+		revert: true,
+		revertDuration: 0
+	});
+	TestHelpers.draggable.shouldNotMove( el, "revert: true, revertDuration: 0 should revert immediately" );
+
+	$( "#draggable2" ).draggable( "option", "revert", "invalid" );
+	TestHelpers.draggable.shouldNotMove( el, "revert: invalid, revertDuration: 0 should revert immediately" );
+
+	$( "#draggable2" ).draggable( "option", "revert", false );
+	TestHelpers.draggable.shouldMove( el, "revert: false should allow movement" );
+
+	$( "#draggable2" ).draggable( "option", {
+		revert: true,
+		revertDuration: 200,
+		stop: function() {
+			start();
+		}
+	});
+	// animation are async, so test for it asynchronously
+	TestHelpers.draggable.move( el, 50, 50 );
+	setTimeout( function() {
+		ok( $( "#draggable2" ).is( ":animated" ), "revert: true with revertDuration should animate" );
+	});
+});
+
+test( "revert: valid", function() {
+	expect( 1 );
+
+	var el = $( "#draggable2" ).draggable({
+			revert: "valid",
+			revertDuration: 0
+		});
+
+	$( "#droppable" ).droppable();
+
+	TestHelpers.draggable.testDrag( el, el, 100, 100, 0, 0, "revert: valid reverts when dropped on a droppable" );
+});
+
+test( "scope", function() {
+	expect( 2 );
+
+	var el = $( "#draggable2" ).draggable({
+		scope: "tasks",
+		revert: "valid",
+		revertDuration: 0
+	});
+
+	$( "#droppable" ).droppable({ scope: "tasks" });
+
+	TestHelpers.draggable.testDrag( el, el, 100, 100, 0, 0, "revert: valid reverts when dropped on a droppable" );
+
+	$( "#droppable" ).droppable("destroy").droppable({ scope: "nottasks" });
 
+	TestHelpers.draggable.testDrag( el, el, 100, 100, 100, 100, "revert: valid reverts when dropped on a droppable" );
+});
+
+test( "scroll, scrollSensitivity, and scrollSpeed", function() {
+	expect( 2 );
+
+	var viewportHeight = $( window ).height(),
+		el = $( "#draggable1" ).draggable({ scroll: true }),
+		scrollSensitivity = el.draggable( "option", "scrollSensitivity" ),
+		scrollSpeed = el.draggable( "option", "scrollSpeed" );
+
+	el.offset({
+		top: viewportHeight - scrollSensitivity - 1,
+		left: 1
+	});
+
+	el.simulate( "drag", {
+		dx: 1,
+		y: viewportHeight - scrollSensitivity - 1,
+		moves: 1
+	});
+
+	ok( $( window ).scrollTop() === 0, "scroll: true doesn't scroll when the element is dragged outside of scrollSensitivity" );
+
+	el.draggable( "option", "scrollSensitivity", scrollSensitivity + 10 );
+
+	el.offset({
+		top: viewportHeight - scrollSensitivity - 1,
+		left: 1
+	});
+
+	el.simulate( "drag", {
+		dx: 1,
+		y: viewportHeight - scrollSensitivity - 1,
+		moves: 1
+	});
+
+	ok( $( window ).scrollTop() === scrollSpeed, "scroll: true scrolls when the element is dragged within scrollSensitivity" );
+
+	TestHelpers.draggable.restoreScroll( document );
+});
+
+test( "snap, snapMode, and snapTolerance", function() {
+	expect( 9 );
+
+	var newX, newY,
+		snapTolerance = 15,
+		el = $( "#draggable1" ).draggable({
+			snap: true,
+			snapMode: "both",
+			snapTolerance: snapTolerance
+		}),
+		element2 = $( "#draggable2" ).draggable();
+
+	el.offset({
+		top: 1,
+		left: 1
+	});
+
+	newX = element2.offset().left - el.outerWidth() - snapTolerance - 1;
+	newY = element2.offset().top;
+
+	el.simulate( "drag", {
+		handle: "corner",
+		x: newX,
+		y: newY,
+		moves: 1
+	});
+
+	deepEqual( el.offset(), { top: newY, left: newX }, "doesn't snap outside the snapTolerance" );
+
+	newX += 2;
+
+	el.simulate( "drag", {
+		handle: "corner",
+		x: newX,
+		y: newY,
+		moves: 1
+	});
+
+	notDeepEqual( el.offset(), { top: newY, left: newX }, "snaps inside the snapTolerance" );
+
+	el.draggable( "option", "snap", "#draggable2" );
+
+	el.simulate( "drag", {
+		handle: "corner",
+		x: newX,
+		y: newY,
+		moves: 1
+	});
+
+	notDeepEqual( el.offset(), { top: newY, left: newX }, "snaps based on selector" );
+
+	el.draggable( "option", "snap", "#draggable3" );
+
+	el.simulate( "drag", {
+		handle: "corner",
+		x: newX,
+		y: newY,
+		moves: 1
+	});
+
+	deepEqual( el.offset(), { top: newY, left: newX }, "doesn't snap based on invalid selector" );
+
+	el.draggable( "option", "snap", true );
+	el.draggable( "option", "snapTolerance", snapTolerance - 2 );
+	el.simulate( "drag", {
+		handle: "corner",
+		x: newX,
+		y: newY,
+		moves: 1
+	});
+
+	deepEqual( el.offset(), { top: newY, left: newX }, "doesn't snap outside the modified snapTolerance" );
+
+	el.draggable( "option", "snapTolerance", snapTolerance );
+	el.draggable( "option", "snapMode", "inner" );
+
+	el.simulate( "drag", {
+		handle: "corner",
+		x: newX,
+		y: newY,
+		moves: 1
+	});
+
+	deepEqual( el.offset(), { top: newY, left: newX }, "doesn't snap inside the outer snapTolerance area when snapMode is inner" );
+
+	newX = element2.offset().left - snapTolerance - 1;
+	newY = element2.offset().top;
+
+	el.simulate( "drag", {
+		handle: "corner",
+		x: newX,
+		y: newY,
+		moves: 1
+	});
+
+	deepEqual( el.offset(), { top: newY, left: newX }, "doesn't snap inside the outer snapTolerance area when snapMode is inner" );
+
+	newX++;
+
+	el.simulate( "drag", {
+		handle: "corner",
+		x: newX,
+		y: newY,
+		moves: 1
+	});
+
+	notDeepEqual( el.offset(), { top: newY, left: newX }, "snaps inside the inner snapTolerance area when snapMode is inner" );
+
+	el.draggable( "option", "snapMode", "outer" );
+
+	el.simulate( "drag", {
+		handle: "corner",
+		x: newX,
+		y: newY,
+		moves: 1
+	});
+
+	deepEqual( el.offset(), { top: newY, left: newX }, "doesn't snap on the inner snapTolerance area when snapMode is outer" );
+});
+
+test( "stack", function() {
+	expect( 2 );
+
+	var element = $( "#draggable1" ).draggable({
+			stack: "#draggable1, #draggable2"
+		}),
+		element2 = $( "#draggable2" ).draggable({
+			stack: "#draggable1, #draggable2"
+		});
+
+	TestHelpers.draggable.move( element, 1, 1 );
+	equal( element.css( "zIndex" ), "2", "stack increments zIndex correctly" );
+
+	TestHelpers.draggable.move( element2, 1, 1 );
+	equal( element2.css( "zIndex" ), "3", "stack increments zIndex correctly" );
+});
+
+test("{ zIndex: 10 }", function() {
 	expect(1);
 
 	var actual,
@@ -723,39 +1296,30 @@ test("{ zIndex: 10 }", function() {
 
 });
 
-test( "{ stack }", function() {
-	expect( 4 );
+test("zIndex, default, switching after initialization", function() {
 
-	var draggable1 = $( "#draggable1" ),
-		draggable2 = $( "#draggable2" ),
-		draggable3 = $( "#draggable3" ),
-		draggable4 = $( "#draggable4" );
+	expect(3);
 
-	// Set z-index as an inline style.
-	$( "#draggable1, #draggable2" )
-		.css( "zIndex", 100 )
-		.draggable({
-			stack: "#draggable1, #draggable2"
-		});
-	// Have z-index applied via CSS, see #9077
-	$( "#draggable3, #draggable4" )
-		.draggable({
-			stack: "#draggable3, #draggable4"
+	var zindex = null,
+		el = $("#draggable2").draggable({
+			start: function() {
+				zindex = $(this).css("z-index");
+			}
 		});
 
-	draggable1.simulate( "drag", {
-		dx: 1,
-		dy: 1
-	});
-	draggable3.simulate( "drag", {
-		dx: 1,
-		dy: 1
-	});
+	el.css( "z-index", 1 );
+
+	TestHelpers.draggable.move( el, 1, 1 );
+	equal( zindex, 1 );
+
+	el.draggable( "option", "zIndex", 5 );
+	TestHelpers.draggable.move( el, 2, 1 );
+	equal( zindex, 5 );
+
+	el.draggable( "option", "zIndex", false );
+	TestHelpers.draggable.move( el, 3, 1 );
+	equal( zindex, 1 );
 
-	equal( draggable1.css( "zIndex" ), 102);
-	equal( draggable2.css( "zIndex" ), 101);
-	equal( draggable3.css( "zIndex" ), 102);
-	equal( draggable4.css( "zIndex" ), 101);
 });
 
 })(jQuery);