* treat 'apps/utils' as regular django app; which used to store

  general tools for used in other apps
* moved 'templatetags' from 'apps/indicator' to 'apps/utils'
* '.gitignore' to ignore 'fixtures_bak'
* moved js plugins from 'apps/indicator/static/plugins' to
  'staticfiles/plugins'

apps/recommend:
* updated 'recommend.models';
    o commented 'recommend.models.ResearchCombination' (not used)
* implemented views 'add_edit_blog_info' and 'ajax_add_edit_configs';
* added pages 'templates/recommend/add_edit_blog_info.html',
    'add_edit_blog_info_error.html';
    o related css and javascripts files
* added 'tools.py';

* added 'utils/tools.py' for placing generic functions;
* deleted 'initial_data.json' (mv 'fixtures' to 'fixtures_bak');
* small fixes to 'indicator.models', 'sciblog.models' and
  'sfaccount.views'

* fixed automatically show 'proper_nouns' annotation in blog:
  recovered the line 'import signals' in 'sciblog.models'
* added 'is_ok()' method for 'recommend.models.ResearchConfig';

1 files changed, 1404 insertions, 0 deletions

diff --git a/97suifangqa/staticfiles/plugins/jquery-ui/tests/unit/draggable/draggable_options.js b/97suifangqa/staticfiles/plugins/jquery-ui/tests/unit/draggable/draggable_options.js
new file mode 100644
index 0000000..635d318
--- /dev/null
+++ b/97suifangqa/staticfiles/plugins/jquery-ui/tests/unit/draggable/draggable_options.js
@@ -0,0 +1,1404 @@
+(function( $ ) {
+
+module( "draggable: options" );
+
+// TODO: This doesn't actually test whether append happened, possibly remove
+test( "{ appendTo: 'parent' }, default, no clone", function() {
+	expect( 2 );
+	var element = $( "#draggable2" ).draggable({ appendTo: "parent" });
+	TestHelpers.draggable.shouldMove( element );
+
+	element = $( "#draggable1" ).draggable({ appendTo: "parent" });
+	TestHelpers.draggable.shouldMove( element );
+});
+
+// TODO: This doesn't actually test whether append happened, possibly remove
+test( "{ appendTo: Element }, no clone", function() {
+	expect( 2 );
+	var element = $( "#draggable2" ).draggable({ appendTo: $( "#draggable2" ).parent()[ 0 ] });
+
+	TestHelpers.draggable.shouldMove( element );
+
+	element = $( "#draggable1" ).draggable({ appendTo: $( "#draggable2" ).parent()[ 0 ] });
+	TestHelpers.draggable.shouldMove( element );
+});
+
+// TODO: This doesn't actually test whether append happened, possibly remove
+test( "{ appendTo: Selector }, no clone", function() {
+	expect( 2 );
+	var element = $( "#draggable2" ).draggable({ appendTo: "#main" });
+	TestHelpers.draggable.shouldMove( element );
+
+	element = $( "#draggable1" ).draggable({ appendTo: "#main" });
+	TestHelpers.draggable.shouldMove( element );
+});
+
+test( "{ appendTo: 'parent' }, default", function() {
+	expect( 2 );
+
+	var element = $( "#draggable1" ).draggable();
+
+	TestHelpers.draggable.trackAppendedParent( element );
+
+	equal( element.draggable( "option", "appendTo" ), "parent" );
+
+	TestHelpers.draggable.move( element, 1, 1 );
+	equal( element.data( "last_dragged_parent" ), $( "#qunit-fixture" )[ 0 ] );
+});
+
+test( "{ appendTo: Element }", function() {
+	expect( 1 );
+
+	var appendTo = $( "#draggable2" ).parent()[ 0 ],
+		element = $( "#draggable1" ).draggable({ appendTo: appendTo });
+
+	TestHelpers.draggable.trackAppendedParent( element );
+
+	TestHelpers.draggable.move( element, 1, 1 );
+	equal( element.data( "last_dragged_parent" ), appendTo );
+});
+
+test( "{ appendTo: jQuery }", function() {
+	expect( 1 );
+
+	var appendTo = $( "#draggable2" ).parent(),
+		element = $( "#draggable1" ).draggable({ appendTo: appendTo });
+
+	TestHelpers.draggable.trackAppendedParent( element );
+
+	TestHelpers.draggable.move( element, 1, 1 );
+	equal( element.data( "last_dragged_parent" ), appendTo[ 0 ] );
+});
+
+test( "{ appendTo: Selector }", function() {
+	expect( 1 );
+
+	var appendTo = "#main",
+		element = $( "#draggable1" ).draggable({ appendTo: appendTo });
+
+	TestHelpers.draggable.trackAppendedParent( element );
+
+	TestHelpers.draggable.move( element, 1, 1 );
+	equal( element.data( "last_dragged_parent" ), $(appendTo)[ 0 ] );
+});
+
+test( "appendTo, default, switching after initialization", function() {
+	expect( 2 );
+
+	var element = $( "#draggable1" ).draggable({ helper : "clone" });
+
+	TestHelpers.draggable.trackAppendedParent( element );
+
+	// Move and make sure element was appended to fixture
+	TestHelpers.draggable.move( element, 1, 1 );
+	equal( element.data( "last_dragged_parent" ), $( "#qunit-fixture" )[ 0 ] );
+
+	// Move and make sure element was appended to main
+	element.draggable( "option", "appendTo", $( "#main" ) );
+	TestHelpers.draggable.move( element, 2, 2 );
+	equal( element.data( "last_dragged_parent" ), $( "#main" )[ 0 ] );
+});
+
+test( "{ axis: false }, default", function() {
+	expect( 1 );
+	var element = $( "#draggable2" ).draggable({ axis: false });
+	TestHelpers.draggable.shouldMove( element );
+});
+
+test( "{ axis: 'x' }", function() {
+	expect( 1 );
+	var element = $( "#draggable2" ).draggable({ axis: "x" });
+	TestHelpers.draggable.testDrag( element, element, 50, 50, 50, 0 );
+});
+
+test( "{ axis: 'y' }", function() {
+	expect( 1 );
+	var element = $( "#draggable2" ).draggable({ axis: "y" });
+	TestHelpers.draggable.testDrag( element, element, 50, 50, 0, 50 );
+});
+
+test( "{ axis: ? }, unexpected", function() {
+	var element,
+		unexpected = {
+			"true": true,
+			"{}": {},
+			"[]": [],
+			"null": null,
+			"undefined": undefined,
+			"function() {}": function() {}
+		};
+
+	expect( 6 );
+
+	$.each(unexpected, function(key, val) {
+		element = $( "#draggable2" ).draggable({ axis: val });
+		TestHelpers.draggable.testDrag( element, element, 50, 50, 50, 50, "axis: " + key );
+		element.draggable( "destroy" );
+	});
+});
+
+test( "axis, default, switching after initialization", function() {
+	expect( 3 );
+
+	var element = $( "#draggable1" ).draggable({ axis : false });
+
+	// Any Direction
+	TestHelpers.draggable.testDrag( element, element, 50, 50, 50, 50 );
+
+	// Only horizontal
+	element.draggable( "option", "axis", "x" );
+	TestHelpers.draggable.testDrag( element, element, 50, 50, 50, 0 );
+
+	// Vertical only
+	element.draggable( "option", "axis", "y" );
+	TestHelpers.draggable.testDrag( element, element, 50, 50, 0, 50 );
+
+});
+
+test( "{ cancel: 'input,textarea,button,select,option' }, default", function() {
+	expect( 2 );
+
+	$( "<div id='draggable-option-cancel-default'><input type='text'></div>" ).appendTo( "#main" );
+
+	var element = $( "#draggable-option-cancel-default" ).draggable({ cancel: "input,textarea,button,select,option" });
+	TestHelpers.draggable.shouldMove( element );
+
+	element.draggable( "destroy" );
+
+	element = $( "#draggable-option-cancel-default" ).draggable({ cancel: "input,textarea,button,select,option" });
+	TestHelpers.draggable.testDrag( element, "#draggable-option-cancel-default input", 50, 50, 0, 0 );
+	element.draggable( "destroy" );
+});
+
+test( "{ cancel: 'span' }", function() {
+	expect( 2 );
+
+	var element = $( "#draggable2" ).draggable();
+	TestHelpers.draggable.testDrag( element, "#draggable2 span", 50, 50, 50, 50 );
+
+	element.draggable( "destroy" );
+
+	element = $( "#draggable2" ).draggable({ cancel: "span" });
+	TestHelpers.draggable.testDrag( element, "#draggable2 span", 50, 50, 0, 0 );
+});
+
+test( "{ cancel: ? }, unexpected", function() {
+	expect( 6 );
+
+	var element,
+		unexpected = {
+			"true": true,
+			"false": false,
+			"{}": {},
+			"[]": [],
+			"null": null,
+			"undefined": undefined
+		};
+
+	$.each( unexpected, function( key, val ) {
+		element = $( "#draggable2" ).draggable({ cancel: val });
+		TestHelpers.draggable.shouldMove( element, "cancel: " + key );
+		element.draggable( "destroy" );
+	});
+});
+
+/**
+test( "{ cancel: Selectors }, matching parent selector", function() {
+
+	expect( 5 );
+
+	var element = $( "#draggable2" ).draggable({ cancel: "span a" });
+
+	$( "#qunit-fixture" ).append( "<span id='wrapping'><a></a></span>" );
+
+	element.find( "span" ).append( "<a>" );
+
+	$( "#wrapping a" ).append( element );
+
+	TestHelpers.draggable.testDrag( element, "#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( element, $( "#draggable2 span a" ).last(), 50, 50, 50, 50, "drag span child" );
+	TestHelpers.draggable.shouldNotMove( $( "#draggable2 span a" ).first() );
+
+});
+*/
+
+test( "cancelement, 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" ),
+		element = $( "#draggable-option-cancel-default" ).draggable();
+
+	TestHelpers.draggable.testDrag( element, input, 50, 50, 0, 0 );
+
+	element.draggable( "option", "cancel", "textarea" );
+	TestHelpers.draggable.testDrag( element, input, 50, 50, 50, 50 );
+
+	element.draggable( "option", "cancel", "input" );
+	TestHelpers.draggable.testDrag( element, input, 50, 50, 0, 0 );
+});
+
+/*
+
+test( "{ connectToSortable: selector }, default", function() {
+	expect( 1 );
+
+	ok(false, "missing test - untested code is broken code" );
+});
+*/
+
+test( "{ containment: Element }", function() {
+	expect( 1 );
+
+	var offsetAfter,
+		element = $( "#draggable1" ).draggable({ containment: $( "#draggable1" ).parent()[ 0 ] }),
+		p = element.parent(),
+		po = p.offset(),
+		expected = {
+			left: po.left + TestHelpers.draggable.border( p, "left" ) + TestHelpers.draggable.margin( element, "left" ),
+			top: po.top + TestHelpers.draggable.border( p, "top" ) + TestHelpers.draggable.margin( element, "top" )
+		};
+
+	element.simulate( "drag", {
+		dx: -100,
+		dy: -100
+	});
+	offsetAfter = element.offset();
+	deepEqual( offsetAfter, expected, "compare offset to parent" );
+});
+
+test( "{ containment: Selector }", function() {
+	expect( 1 );
+
+	var offsetAfter,
+		element = $( "#draggable1" ).draggable({ containment: $( "#qunit-fixture" ) }),
+		p = element.parent(),
+		po = p.offset(),
+		expected = {
+			left: po.left + TestHelpers.draggable.border( p, "left" ) + TestHelpers.draggable.margin( element, "left" ),
+			top: po.top + TestHelpers.draggable.border( p, "top" ) + TestHelpers.draggable.margin( element, "top" )
+		};
+
+	element.simulate( "drag", {
+		dx: -100,
+		dy: -100
+	});
+	offsetAfter = element.offset();
+	deepEqual( offsetAfter, expected, "compare offset to parent" );
+});
+
+test( "{ containment: [x1, y1, x2, y2] }", function() {
+	expect( 1 );
+
+	var element = $( "#draggable1" ).draggable(),
+		eo = element.offset();
+
+	element.draggable( "option", "containment", [ eo.left, eo.top, eo.left + element.width() + 5, eo.top + element.height() + 5 ] );
+
+	TestHelpers.draggable.testDrag( element, element, -100, -100, 0, 0 );
+});
+
+test( "{ containment: 'parent' }, relative", function() {
+	expect( 1 );
+
+	var offsetAfter,
+		element = $( "#draggable1" ).draggable({ containment: "parent" }),
+		p = element.parent(),
+		po = p.offset(),
+		expected = {
+			left: po.left + TestHelpers.draggable.border( p, "left" ) + TestHelpers.draggable.margin( element, "left" ),
+			top: po.top + TestHelpers.draggable.border( p, "top" ) + TestHelpers.draggable.margin( element, "top" )
+		};
+
+	element.simulate( "drag", {
+		dx: -100,
+		dy: -100
+	});
+	offsetAfter = element.offset();
+	deepEqual( offsetAfter, expected, "compare offset to parent" );
+});
+
+test( "{ containment: 'parent' }, absolute", function() {
+	expect( 1 );
+
+	var offsetAfter,
+		element = $( "#draggable2" ).draggable({ containment: "parent" }),
+		p = element.parent(),
+		po = p.offset(),
+		expected = {
+			left: po.left + TestHelpers.draggable.border( p, "left" ) + TestHelpers.draggable.margin( element, "left" ),
+			top: po.top + TestHelpers.draggable.border( p, "top" ) + TestHelpers.draggable.margin( element, "top" )
+		};
+
+	element.simulate( "drag", {
+		dx: -100,
+		dy: -100
+	});
+	offsetAfter = element.offset();
+	deepEqual( offsetAfter, expected, "compare offset to parent" );
+});
+
+test( "containment, account for border", function() {
+	expect( 2 );
+
+	var el = $("#draggable1").appendTo("#main"),
+		parent = el.parent().css({
+			height: "100px",
+			width: "100px",
+			borderStyle: "solid",
+			borderWidth: "5px 10px 15px 20px"
+		}),
+		parentBottom = parent.offset().top + parent.outerHeight(),
+		parentRight = parent.offset().left + parent.outerWidth(),
+		parentBorderBottom = TestHelpers.draggable.border( parent, "bottom" ),
+		parentBorderRight = TestHelpers.draggable.border( parent, "right" );
+
+	el.css({
+		height: "5px",
+		width: "5px"
+	}).draggable({ containment: "parent" });
+
+	el.simulate( "drag", {
+		dx: 100,
+		dy: 100
+	});
+
+	equal( el.offset().top, parentBottom - parentBorderBottom - el.height(),
+		"The draggable should be on top of its parent's bottom border" );
+	equal( el.offset().left, parentRight - parentBorderRight - el.width(),
+		"The draggable should be to the right of its parent's right border" );
+});
+
+test( "containment, default, switching after initialization", function() {
+	expect( 3 );
+
+	var element = $( "#draggable1" ).draggable({ containment: false });
+
+	TestHelpers.draggable.testDrag( element, element, -100, -100, -100, -100 );
+
+	element.draggable( "option", "containment", "parent" )
+		.css({
+			top: 0,
+			left: 0
+		})
+		.appendTo( $( "#main" ) );
+
+	TestHelpers.draggable.testDrag( element, element, -100, -100, 0, 0 );
+
+	element.draggable( "option", "containment", false );
+	TestHelpers.draggable.testDrag( element, element, -100, -100, -100, -100 );
+});
+
+test( "{ cursor: 'auto' }, default", function() {
+	function getCursor() {
+		return $( "#draggable2" ).css( "cursor" );
+	}
+
+	expect( 2 );
+
+	var actual, after,
+		expected = "auto",
+		element = $( "#draggable2" ).draggable({
+			cursor: expected,
+			start: function() {
+				actual = getCursor();
+			}
+		}),
+		before = getCursor();
+
+	element.simulate( "drag", {
+		dx: -1,
+		dy: -1
+	});
+	after = getCursor();
+
+	equal( actual, expected, "start callback: cursor '" + expected + "'" );
+	equal( after, before, "after drag: cursor restored" );
+});
+
+test( "{ cursor: 'move' }", function() {
+	function getCursor() {
+		return $( "body" ).css( "cursor" );
+	}
+
+	expect( 2 );
+
+	var actual, after,
+		expected = "move",
+		element = $( "#draggable2" ).draggable({
+			cursor: expected,
+			start: function() {
+				actual = getCursor();
+			}
+		}),
+		before = getCursor();
+
+	element.simulate( "drag", {
+		dx: -1,
+		dy: -1
+	});
+	after = getCursor();
+
+	equal( actual, expected, "start callback: cursor '" + expected + "'" );
+	equal( after, before, "after drag: cursor restored" );
+});
+
+test( "cursor, default, switching after initialization", function() {
+	expect( 3 );
+
+	var element = $( "#draggable1" ).draggable();
+
+	TestHelpers.draggable.trackMouseCss( element );
+
+	TestHelpers.draggable.move( element, 1, 1 );
+	equal( element.data( "last_dragged_cursor" ), "auto" );
+
+	element.draggable( "option", "cursor", "move" );
+	TestHelpers.draggable.move( element, 1, 1 );
+	equal( element.data( "last_dragged_cursor" ), "move" );
+
+	element.draggable( "option", "cursor", "ns-resize" );
+	TestHelpers.draggable.move( element, 1, 1 );
+	equal( element.data( "last_dragged_cursor" ), "ns-resize" );
+});
+
+test( "cursorAt", 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 element = $( "#draggable" + ( i + 1 ) ).draggable({
+					cursorAt: testData.cursorAt,
+					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" );
+						}
+					}
+			});
+
+			element.simulate( "drag", {
+				moves: 1,
+				dx: deltaX,
+				dy: deltaY
+			});
+		});
+	});
+});
+
+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 element = $( "#draggable" + ( i + 1 ) );
+
+			element.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" );
+						}
+					}
+			});
+
+			element.draggable( "option", "cursorAt", false );
+			element.draggable( "option", "cursorAt", testData.cursorAt );
+
+			element.simulate( "drag", {
+				moves: 1,
+				dx: deltaX,
+				dy: deltaY
+			});
+		});
+	});
+});
+
+test( "disabled", function() {
+	expect( 3 );
+
+	var element = $( "#draggable1" ).draggable();
+
+	TestHelpers.draggable.shouldMove( element );
+
+	element.draggable( "option", "disabled", true );
+	TestHelpers.draggable.shouldNotMove( element );
+
+	element.draggable( "option", "disabled", false );
+	TestHelpers.draggable.shouldMove( element );
+});
+
+test( "{ grid: [50, 50] }, relative", function() {
+	expect( 2 );
+
+	var element = $( "#draggable1" ).draggable({ grid: [ 50, 50 ] });
+	TestHelpers.draggable.testDrag( element, element, 24, 24, 0, 0 );
+	TestHelpers.draggable.testDrag( element, element, 26, 25, 50, 50 );
+});
+
+test( "{ grid: [50, 50] }, absolute", function() {
+	expect( 2 );
+
+	var element = $( "#draggable2" ).draggable({ grid: [ 50, 50 ] });
+	TestHelpers.draggable.testDrag( element, element, 24, 24, 0, 0 );
+	TestHelpers.draggable.testDrag( element, element, 26, 25, 50, 50 );
+});
+
+test( "grid, switching after initialization", function() {
+	expect( 4 );
+
+	var element = $( "#draggable1" ).draggable();
+
+	// Forward
+	TestHelpers.draggable.testDrag( element, element, 24, 24, 24, 24 );
+	TestHelpers.draggable.testDrag( element, element, 0, 0, 0, 0 );
+
+	element.draggable( "option", "grid", [ 50,50 ] );
+
+	TestHelpers.draggable.testDrag( element, element, 24, 24, 0, 0 );
+	TestHelpers.draggable.testDrag( element, element, 26, 25, 50, 50 );
+});
+
+test( "{ handle: 'span' }", function() {
+	expect( 3 );
+
+	var element = $( "#draggable2" ).draggable({ handle: "span" });
+
+	TestHelpers.draggable.testDrag( element, "#draggable2 span", 50, 50, 50, 50, "drag span" );
+	TestHelpers.draggable.testDrag( element, "#draggable2 span em", 50, 50, 50, 50, "drag span child" );
+	TestHelpers.draggable.shouldNotMove( element, "drag element" );
+});
+
+test( "handle, default, switching after initialization", function() {
+	expect( 6 );
+
+	var element = $( "#draggable2" ).draggable();
+
+	TestHelpers.draggable.testDrag( element, element, 50, 50, 50, 50 );
+	TestHelpers.draggable.testDrag( element, "#draggable2 span", 100, 100, 100, 100 );
+
+	// Switch
+	element.draggable( "option", "handle", "span" );
+	TestHelpers.draggable.testDrag( element, element, 50, 50, 0, 0 );
+	TestHelpers.draggable.testDrag( element, "#draggable2 span", 100, 100, 100, 100 );
+
+	// And back
+	element.draggable( "option", "handle", false );
+	TestHelpers.draggable.testDrag( element, element, 50, 50, 50, 50 );
+	TestHelpers.draggable.testDrag( element, "#draggable2 span", 100, 100, 100, 100 );
+});
+
+test( "helper, default, switching after initialization", function() {
+	expect( 3 );
+
+	var element = $( "#draggable1" ).draggable();
+	TestHelpers.draggable.shouldMove( element );
+
+	element.draggable( "option", "helper", "clone" );
+	TestHelpers.draggable.shouldNotMove( element );
+
+	element.draggable( "option", "helper", "original" );
+	TestHelpers.draggable.shouldMove( element );
+});
+
+test( "{ helper: 'clone' }, relative", function() {
+	expect( 1 );
+
+	var element = $( "#draggable1" ).draggable({ helper: "clone" });
+	TestHelpers.draggable.shouldNotMove( element );
+});
+
+test( "{ helper: 'clone' }, absolute", function() {
+	expect( 1 );
+
+	var element = $( "#draggable2" ).draggable({ helper: "clone" });
+	TestHelpers.draggable.shouldNotMove( element );
+});
+
+test( "{ helper: 'original' }, relative, with scroll offset on parent", function() {
+	expect( 3 );
+
+	var element = $( "#draggable1" ).draggable({ helper: "original" });
+
+	TestHelpers.draggable.setScroll();
+	TestHelpers.draggable.testScroll( element, "relative" );
+
+	TestHelpers.draggable.setScroll();
+	TestHelpers.draggable.testScroll( element, "static" );
+
+	TestHelpers.draggable.setScroll();
+	TestHelpers.draggable.testScroll( element, "absolute" );
+
+	TestHelpers.draggable.restoreScroll();
+});
+
+test( "{ helper: 'original' }, relative, with scroll offset on root", function() {
+	expect( 3 );
+
+	var element = $( "#draggable1" ).draggable({ helper: "original" });
+
+	TestHelpers.draggable.setScroll( "root" );
+	TestHelpers.draggable.testScroll( element, "relative" );
+
+	TestHelpers.draggable.setScroll( "root" );
+	TestHelpers.draggable.testScroll( element, "static" );
+
+	TestHelpers.draggable.setScroll( "root" );
+	TestHelpers.draggable.testScroll( element, "absolute" );
+
+	TestHelpers.draggable.restoreScroll( "root" );
+});
+
+test( "{ helper: 'original' }, relative, with scroll offset on root and parent", function() {
+	expect( 3 );
+
+	var element = $( "#draggable1" ).draggable({ helper: "original" });
+
+	TestHelpers.draggable.setScroll();
+	TestHelpers.draggable.setScroll( "root" );
+	TestHelpers.draggable.testScroll( element, "relative" );
+
+	TestHelpers.draggable.setScroll();
+	TestHelpers.draggable.setScroll( "root" );
+	TestHelpers.draggable.testScroll( element, "static" );
+
+	TestHelpers.draggable.setScroll();
+	TestHelpers.draggable.setScroll( "root" );
+	TestHelpers.draggable.testScroll( element, "absolute" );
+
+	TestHelpers.draggable.restoreScroll();
+	TestHelpers.draggable.restoreScroll( "root" );
+});
+
+test( "{ helper: 'original' }, absolute, with scroll offset on parent", function() {
+	expect( 3 );
+
+	var element = $( "#draggable1" ).css({ position: "absolute", top: 0, left: 0 }).draggable({ helper: "original" });
+
+	TestHelpers.draggable.setScroll();
+	TestHelpers.draggable.testScroll( element, "relative" );
+
+	TestHelpers.draggable.setScroll();
+	TestHelpers.draggable.testScroll( element, "static" );
+
+	TestHelpers.draggable.setScroll();
+	TestHelpers.draggable.testScroll( element, "absolute" );
+
+	TestHelpers.draggable.restoreScroll();
+});
+
+test( "{ helper: 'original' }, absolute, with scroll offset on root", function() {
+	expect( 3 );
+
+	var element = $( "#draggable1" ).css({ position: "absolute", top: 0, left: 0 }).draggable({ helper: "original" });
+
+	TestHelpers.draggable.setScroll( "root" );
+	TestHelpers.draggable.testScroll( element, "relative" );
+
+	TestHelpers.draggable.setScroll( "root" );
+	TestHelpers.draggable.testScroll( element, "static" );
+
+	TestHelpers.draggable.setScroll( "root" );
+	TestHelpers.draggable.testScroll( element, "absolute" );
+
+	TestHelpers.draggable.restoreScroll( "root" );
+});
+
+test( "{ helper: 'original' }, absolute, with scroll offset on root and parent", function() {
+	expect( 3 );
+
+	var element = $( "#draggable1" ).css({ position: "absolute", top: 0, left: 0 }).draggable({ helper: "original" });
+
+	TestHelpers.draggable.setScroll();
+	TestHelpers.draggable.setScroll( "root" );
+	TestHelpers.draggable.testScroll( element, "relative" );
+
+	TestHelpers.draggable.setScroll();
+	TestHelpers.draggable.setScroll( "root" );
+	TestHelpers.draggable.testScroll( element, "static" );
+
+	TestHelpers.draggable.setScroll();
+	TestHelpers.draggable.setScroll( "root" );
+	TestHelpers.draggable.testScroll( element, "absolute" );
+
+	TestHelpers.draggable.restoreScroll();
+	TestHelpers.draggable.restoreScroll( "root" );
+});
+
+test( "{ helper: 'original' }, fixed, with scroll offset on parent", function() {
+	expect( 3 );
+
+	var element = $( "#draggable1" ).css({ position: "fixed", top: 0, left: 0 }).draggable({ helper: "original" });
+
+	TestHelpers.draggable.setScroll();
+	TestHelpers.draggable.testScroll( element, "relative" );
+
+	TestHelpers.draggable.setScroll();
+	TestHelpers.draggable.testScroll( element, "static" );
+
+	TestHelpers.draggable.setScroll();
+	TestHelpers.draggable.testScroll( element, "absolute" );
+
+	TestHelpers.draggable.restoreScroll();
+});
+
+test( "{ helper: 'original' }, fixed, with scroll offset on root", function() {
+	expect( 3 );
+
+	var element = $( "#draggable1" ).css({ position: "fixed", top: 0, left: 0 }).draggable({ helper: "original" });
+
+	TestHelpers.draggable.setScroll( "root" );
+	TestHelpers.draggable.testScroll( element, "relative" );
+
+	TestHelpers.draggable.setScroll( "root" );
+	TestHelpers.draggable.testScroll( element, "static" );
+
+	TestHelpers.draggable.setScroll( "root" );
+	TestHelpers.draggable.testScroll( element, "absolute" );
+
+	TestHelpers.draggable.restoreScroll( "root" );
+});
+
+test( "{ helper: 'original' }, fixed, with scroll offset on root and parent", function() {
+	expect( 3 );
+
+	var element = $( "#draggable1" ).css({ position: "fixed", top: 0, left: 0 }).draggable({ helper: "original" });
+
+	TestHelpers.draggable.setScroll();
+	TestHelpers.draggable.setScroll( "root" );
+	TestHelpers.draggable.testScroll( element, "relative" );
+
+	TestHelpers.draggable.setScroll();
+	TestHelpers.draggable.setScroll( "root" );
+	TestHelpers.draggable.testScroll( element, "static" );
+
+	TestHelpers.draggable.setScroll();
+	TestHelpers.draggable.setScroll( "root" );
+	TestHelpers.draggable.testScroll( element, "absolute" );
+
+	TestHelpers.draggable.restoreScroll();
+	TestHelpers.draggable.restoreScroll( "root" );
+});
+
+test( "{ helper: 'clone' }, absolute", function() {
+	expect( 1 );
+
+	var helperOffset = null,
+		origOffset = $( "#draggable1" ).offset(),
+		element = $( "#draggable1" ).draggable({ helper: "clone", drag: function( event, ui) {
+			helperOffset = ui.helper.offset();
+		} });
+
+	element.simulate( "drag", {
+		dx: 1,
+		dy: 1
+	});
+	deepEqual({ top: helperOffset.top - 1, left: helperOffset.left - 1 }, origOffset, "dragged[1, 1]" );
+});
+
+test( "{ helper: 'clone' }, absolute with scroll offset on parent", function() {
+	expect( 3 );
+
+	TestHelpers.draggable.setScroll();
+	var helperOffset = null,
+		origOffset = null,
+		element = $( "#draggable1" ).draggable({
+			helper: "clone",
+			drag: function( event, ui) {
+				helperOffset = ui.helper.offset();
+			}
+		});
+
+	$( "#main" ).css( "position", "relative" );
+	origOffset = $( "#draggable1" ).offset();
+	element.simulate( "drag", {
+		dx: 1,
+		dy: 1
+	});
+	deepEqual({ top: helperOffset.top - 1, left: helperOffset.left - 1 }, origOffset, "dragged[1, 1]" );
+
+	$( "#main" ).css( "position", "static" );
+	origOffset = $( "#draggable1" ).offset();
+	element.simulate( "drag", {
+		dx: 1,
+		dy: 1
+	});
+	deepEqual({ top: helperOffset.top - 1, left: helperOffset.left - 1 }, origOffset, "dragged[1, 1]" );
+
+	$( "#main" ).css( "position", "absolute" );
+	origOffset = $( "#draggable1" ).offset();
+	element.simulate( "drag", {
+		dx: 1,
+		dy: 1
+	});
+	deepEqual({ top: helperOffset.top - 1, left: helperOffset.left - 1 }, origOffset, "dragged[1, 1]" );
+
+	TestHelpers.draggable.restoreScroll();
+});
+
+test( "{ helper: 'clone' }, absolute with scroll offset on root", function() {
+	expect( 3 );
+
+	TestHelpers.draggable.setScroll( "root" );
+	var helperOffset = null,
+		origOffset = null,
+		element = $( "#draggable1" ).draggable({
+			helper: "clone",
+			drag: function( event, ui) {
+				helperOffset = ui.helper.offset();
+			}
+		});
+
+	$( "#main" ).css( "position", "relative" );
+	origOffset = $( "#draggable1" ).offset();
+	element.simulate( "drag", {
+		dx: 1,
+		dy: 1
+	});
+	deepEqual({ top: helperOffset.top - 1, left: helperOffset.left - 1 }, origOffset, "dragged[1, 1]" );
+
+	$( "#main" ).css( "position", "static" );
+	origOffset = $( "#draggable1" ).offset();
+	element.simulate( "drag", {
+		dx: 1,
+		dy: 1
+	});
+	deepEqual({ top: helperOffset.top - 1, left: helperOffset.left - 1 }, origOffset, "dragged[1, 1]" );
+
+	$( "#main" ).css( "position", "absolute" );
+	origOffset = $( "#draggable1" ).offset();
+	element.simulate( "drag", {
+		dx: 1,
+		dy: 1
+	});
+	deepEqual({ top: helperOffset.top - 1, left: helperOffset.left - 1 }, origOffset, "dragged[1, 1]" );
+
+	TestHelpers.draggable.restoreScroll( "root" );
+});
+
+test( "{ helper: 'clone' }, absolute with scroll offset on root and parent", function() {
+	expect( 3 );
+
+	TestHelpers.draggable.setScroll( "root" );
+	TestHelpers.draggable.setScroll();
+
+	var helperOffset = null,
+		origOffset = null,
+		element = $( "#draggable1" ).draggable({
+			helper: "clone",
+			drag: function( event, ui) {
+				helperOffset = ui.helper.offset();
+			}
+		});
+
+	$( "#main" ).css( "position", "relative" );
+	origOffset = $( "#draggable1" ).offset();
+	element.simulate( "drag", {
+		dx: 1,
+		dy: 1
+	});
+	deepEqual({ top: helperOffset.top - 1, left: helperOffset.left - 1 }, origOffset, "dragged[1, 1]" );
+
+	$( "#main" ).css( "position", "static" );
+	origOffset = $( "#draggable1" ).offset();
+	element.simulate( "drag", {
+		dx: 1,
+		dy: 1
+	});
+	deepEqual({ top: helperOffset.top - 1, left: helperOffset.left - 1 }, origOffset, "dragged[1, 1]" );
+
+	$( "#main" ).css( "position", "absolute" );
+	origOffset = $( "#draggable1" ).offset();
+	element.simulate( "drag", {
+		dx: 1,
+		dy: 1
+	});
+	deepEqual({ top: helperOffset.top - 1, left: helperOffset.left - 1 }, origOffset, "dragged[1, 1]" );
+
+	TestHelpers.draggable.restoreScroll( "root" );
+	TestHelpers.draggable.restoreScroll();
+});
+
+test( "{ opacity: 0.5 }", function() {
+	expect( 1 );
+
+	var opacity = null,
+		element = $( "#draggable2" ).draggable({
+			opacity: 0.5,
+			start: function() {
+				opacity = $(this).css( "opacity" );
+			}
+		});
+
+	element.simulate( "drag", {
+		dx: -1,
+		dy: -1
+	});
+
+	equal( opacity, 0.5, "start callback: opacity is" );
+});
+
+test( "opacity, default, switching after initialization", function() {
+	expect( 3 );
+
+	var opacity = null,
+		element = $( "#draggable2" ).draggable({
+			start: function() {
+				opacity = $(this).css( "opacity" );
+			}
+		});
+
+	TestHelpers.draggable.move( element, 1, 1 );
+	equal( opacity, 1 );
+
+	element.draggable( "option", "opacity", 0.5 );
+	TestHelpers.draggable.move( element, 2, 1 );
+	equal( opacity, 0.5 );
+
+	element.draggable( "option", "opacity", false );
+	TestHelpers.draggable.move( element, 3, 1 );
+	equal( opacity, 1 );
+});
+
+asyncTest( "revert and revertDuration", function() {
+	expect( 4 );
+
+	var element = $( "#draggable2" ).draggable({
+		revert: true,
+		revertDuration: 0
+	});
+	TestHelpers.draggable.shouldNotMove( element, "revert: true, revertDuration: 0 should revert immediately" );
+
+	$( "#draggable2" ).draggable( "option", "revert", "invalid" );
+	TestHelpers.draggable.shouldNotMove( element, "revert: invalid, revertDuration: 0 should revert immediately" );
+
+	$( "#draggable2" ).draggable( "option", "revert", false );
+	TestHelpers.draggable.shouldMove( element, "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( element, 50, 50 );
+	setTimeout( function() {
+		ok( $( "#draggable2" ).is( ":animated" ), "revert: true with revertDuration should animate" );
+	});
+});
+
+test( "revert: valid", function() {
+	expect( 1 );
+
+	var element = $( "#draggable2" ).draggable({
+			revert: "valid",
+			revertDuration: 0
+		});
+
+	$( "#droppable" ).droppable();
+
+	TestHelpers.draggable.testDrag( element, element, 100, 100, 0, 0, "revert: valid reverts when dropped on a droppable" );
+});
+
+test( "scope", function() {
+	expect( 2 );
+
+	var element = $( "#draggable2" ).draggable({
+		scope: "tasks",
+		revert: "valid",
+		revertDuration: 0
+	});
+
+	$( "#droppable" ).droppable({ scope: "tasks" });
+
+	TestHelpers.draggable.testDrag( element, element, 100, 100, 0, 0, "revert: valid reverts when dropped on a droppable in scope" );
+
+	$( "#droppable" ).droppable( "destroy" ).droppable({ scope: "nottasks" });
+
+	TestHelpers.draggable.testDrag( element, element, 100, 100, 100, 100, "revert: valid reverts when dropped on a droppable out of scope" );
+});
+
+test( "scroll, scrollSensitivity, and scrollSpeed", function() {
+	expect( 2 );
+
+	var viewportHeight = $( window ).height(),
+		element = $( "#draggable1" ).draggable({ scroll: true }),
+		scrollSensitivity = element.draggable( "option", "scrollSensitivity" ),
+		scrollSpeed = element.draggable( "option", "scrollSpeed" );
+
+	element.offset({
+		top: viewportHeight - scrollSensitivity - 1,
+		left: 1
+	});
+
+	element.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" );
+
+	element.draggable( "option", "scrollSensitivity", scrollSensitivity + 10 );
+
+	element.offset({
+		top: viewportHeight - scrollSensitivity - 1,
+		left: 1
+	});
+
+	element.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( "#6817: auto scroll goes double distance when dragging", function() {
+	expect( 2 );
+
+	var offsetBefore,
+		distance = 10,
+		viewportHeight = $( window ).height(),
+		element = $( "#draggable1" ).draggable({
+			scroll: true,
+			stop: function( e, ui ) {
+				equal( ui.offset.top, newY, "offset of item matches pointer position after scroll" );
+				// TODO: fix IE8 testswarm IFRAME positioning bug so closeEnough can be turned back to equal
+				closeEnough( ui.offset.top - offsetBefore.top, distance, 1, "offset of item only moves expected distance after scroll" );
+			}
+		}),
+		scrollSensitivity = element.draggable( "option", "scrollSensitivity" ),
+		oldY = viewportHeight - scrollSensitivity,
+		newY = oldY + distance;
+
+	element.offset({
+		top: oldY,
+		left: 1
+	});
+
+	offsetBefore = element.offset();
+
+	element.simulate( "drag", {
+		handle: "corner",
+		dx: 1,
+		y: newY,
+		moves: 1
+	});
+
+	TestHelpers.draggable.restoreScroll( document );
+});
+
+test( "snap, snapMode, and snapTolerance", function() {
+	expect( 10 );
+
+	var newX, newY,
+		snapTolerance = 15,
+		element = $( "#draggable1" ).draggable({
+			snap: true,
+			snapMode: "both",
+			snapTolerance: snapTolerance
+		}),
+		element2 = $( "#draggable2" ).draggable();
+
+	element.offset({
+		top: 1,
+		left: 1
+	});
+
+	newX = element2.offset().left - element.outerWidth() - snapTolerance - 2;
+	newY = element2.offset().top;
+
+	element.simulate( "drag", {
+		handle: "corner",
+		x: newX,
+		y: newY,
+		moves: 1
+	});
+
+	// TODO: fix IE8 testswarm IFRAME positioning bug so closeEnough can be turned back to equal
+	closeEnough( element.offset().left, newX, 1, "doesn't snap outside the snapTolerance" );
+	closeEnough( element.offset().top, newY, 1, "doesn't snap outside the snapTolerance" );
+
+	newX += 3;
+
+	element.simulate( "drag", {
+		handle: "corner",
+		x: newX,
+		y: newY,
+		moves: 1
+	});
+
+	notDeepEqual( element.offset(), { top: newY, left: newX }, "snaps inside the snapTolerance" );
+
+	element.draggable( "option", "snap", "#draggable2" );
+
+	element.simulate( "drag", {
+		handle: "corner",
+		x: newX,
+		y: newY,
+		moves: 1
+	});
+
+	notDeepEqual( element.offset(), { top: newY, left: newX }, "snaps based on selector" );
+
+	element.draggable( "option", "snap", "#draggable3" );
+
+	element.simulate( "drag", {
+		handle: "corner",
+		x: newX,
+		y: newY,
+		moves: 1
+	});
+
+	deepEqual( element.offset(), { top: newY, left: newX }, "doesn't snap based on invalid selector" );
+
+	element.draggable( "option", "snap", true );
+	element.draggable( "option", "snapTolerance", snapTolerance - 2 );
+	element.simulate( "drag", {
+		handle: "corner",
+		x: newX,
+		y: newY,
+		moves: 1
+	});
+
+	deepEqual( element.offset(), { top: newY, left: newX }, "doesn't snap outside the modified snapTolerance" );
+
+	element.draggable( "option", "snapTolerance", snapTolerance );
+	element.draggable( "option", "snapMode", "inner" );
+
+	element.simulate( "drag", {
+		handle: "corner",
+		x: newX,
+		y: newY,
+		moves: 1
+	});
+
+	deepEqual( element.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;
+
+	element.simulate( "drag", {
+		handle: "corner",
+		x: newX,
+		y: newY,
+		moves: 1
+	});
+
+	deepEqual( element.offset(), { top: newY, left: newX }, "doesn't snap inside the outer snapTolerance area when snapMode is inner" );
+
+	newX++;
+
+	element.simulate( "drag", {
+		handle: "corner",
+		x: newX,
+		y: newY,
+		moves: 1
+	});
+
+	notDeepEqual( element.offset(), { top: newY, left: newX }, "snaps inside the inner snapTolerance area when snapMode is inner" );
+
+	element.draggable( "option", "snapMode", "outer" );
+
+	element.simulate( "drag", {
+		handle: "corner",
+		x: newX,
+		y: newY,
+		moves: 1
+	});
+
+	deepEqual( element.offset(), { top: newY, left: newX }, "doesn't snap on the inner snapTolerance area when snapMode is outer" );
+});
+
+test( "#8459: element can snap to an element that was removed during drag", function() {
+	expect( 2 );
+
+	var newX, newY,
+		snapTolerance = 15,
+		element = $( "#draggable1" ).draggable({
+			snap: true,
+			snapMode: "both",
+			snapTolerance: snapTolerance,
+			start: function() {
+				element2.remove();
+			}
+		}),
+		element2 = $( "#draggable2" ).draggable();
+
+	element.offset({
+		top: 1,
+		left: 1
+	});
+
+	newX = element2.offset().left - element.outerWidth() - snapTolerance + 1;
+	newY = element2.offset().top;
+
+	element.simulate( "drag", {
+		handle: "corner",
+		x: newX,
+		y: newY,
+		moves: 1
+	});
+
+	// Support: Opera 12.10, Safari 5.1, jQuery <1.8
+	if ( TestHelpers.draggable.unreliableContains ) {
+		ok( true, "Opera <12.14 and Safari <6.0 report wrong values for $.contains in jQuery < 1.8" );
+		ok( true, "Opera <12.14 and Safari <6.0 report wrong values for $.contains in jQuery < 1.8" );
+	} else {
+		// TODO: fix IE8 testswarm IFRAME positioning bug so closeEnough can be turned back to equal
+		closeEnough( element.offset().left, newX, 1, "doesn't snap to a removed element" );
+		closeEnough( element.offset().top, newY, 1, "doesn't snap to a removed element" );
+	}
+});
+
+test( "#8165: Snapping large rectangles to small rectangles doesn't snap properly", function() {
+	expect( 1 );
+
+	var snapTolerance = 20,
+		y = 1,
+		element = $( "#draggable1" )
+			.css({
+				width: "50px",
+				height: "200px"
+			}).offset({
+				top: y,
+				left: 1
+			}),
+		element2 = $( "#draggable2" )
+			.css({
+				width: "50px",
+				height: "50px"
+			}).offset({
+				top: y + snapTolerance + 1,
+				left: 200
+			}),
+		newX = element2.offset().left - element.outerWidth() - snapTolerance + 1;
+
+	$( "#draggable1, #draggable2" ).draggable({
+		snap: true,
+		snapTolerance: snapTolerance
+	});
+
+	element.simulate( "drag", {
+		handle: "corner",
+		x: newX,
+		moves: 1
+	});
+
+	notDeepEqual( element.offset(), { top: y, left: newX }, "snaps even if only a side (not a corner) is inside the snapTolerance" );
+});
+
+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,
+		expected = 10,
+		element = $( "#draggable2" ).draggable({
+			zIndex: expected,
+			start: function() {
+				actual = $(this).css( "zIndex" );
+			}
+		});
+
+	element.simulate( "drag", {
+		dx: -1,
+		dy: -1
+	});
+
+	equal( actual, expected, "start callback: zIndex is" );
+
+});
+
+test( "zIndex, default, switching after initialization", function() {
+
+	expect( 3 );
+
+	var zindex = null,
+		element = $( "#draggable2" ).draggable({
+			start: function() {
+				zindex = $(this).css( "z-index" );
+			}
+		});
+
+	element.css( "z-index", 1 );
+
+	TestHelpers.draggable.move( element, 1, 1 );
+	equal( zindex, 1 );
+
+	element.draggable( "option", "zIndex", 5 );
+	TestHelpers.draggable.move( element, 2, 1 );
+	equal( zindex, 5 );
+
+	element.draggable( "option", "zIndex", false );
+	TestHelpers.draggable.move( element, 3, 1 );
+	equal( zindex, 1 );
+
+});
+
+})( jQuery );