sortable unit tests - fixed el.css not a function

diff --git a/tests/unit/sortable/sortable_core.js b/tests/unit/sortable/sortable_core.js
index ecc12039815278b65798e55e7b4ba5972f4567e8..ff185987455a3318ff0950e1d7d102ab49ea423c 100644 (file)
--- a/tests/unit/sortable/sortable_core.js
+++ b/tests/unit/sortable/sortable_core.js
@@ -2,26 +2,6 @@
  * sortable_core.js
  */
 
-var el, offsetBefore, offsetAfter, dragged;
-
-var drag = function(handle, dx, dy) {
-       offsetBefore = $(handle).offset();
-       $(handle).simulate("drag", {
-               dx: dx || 0,
-               dy: dy || 0
-       });
-       dragged = { dx: dx, dy: dy };
-       offsetAfter = $(handle).offset();
-}
-
-var sort = function(handle, dx, dy, index, msg) {
-       drag(handle, dx, dy);
-       equals($(handle).parent().children().index(handle), index, msg);
-}
-
-var border = function(el, side) { return parseInt(el.css('border-' + side + '-width')); }
-var margin = function(el, side) { return parseInt(el.css('margin-' + side)); }
-
 (function($) {
 
 module("sortable: core");

diff --git a/tests/unit/sortable/sortable_methods.js b/tests/unit/sortable/sortable_methods.js
index 7e1fd2c90da18c2b1cfaf6aa74ca6c451e3fc3b4..e19ccc58f4d4a5d69fc0d9f6e161e1c1c04e8b95 100644 (file)
--- a/tests/unit/sortable/sortable_methods.js
+++ b/tests/unit/sortable/sortable_methods.js
@@ -3,6 +3,23 @@
  */
 (function($) {
 
+var el, offsetBefore, offsetAfter, dragged;
+
+var drag = function(handle, dx, dy) {
+       offsetBefore = $(handle).offset();
+       $(handle).simulate("drag", {
+               dx: dx || 0,
+               dy: dy || 0
+       });
+       dragged = { dx: dx, dy: dy };
+       offsetAfter = $(handle).offset();
+}
+
+var sort = function(handle, dx, dy, index, msg) {
+       drag(handle, dx, dy);
+       equals($(handle).parent().children().index(handle), index, msg);
+}
+
 module("sortable: methods");
 
 test("init", function() {

diff --git a/tests/unit/sortable/sortable_tickets.js b/tests/unit/sortable/sortable_tickets.js
index 53ef62ae95cd04b3085779d5a68a68ba7dae97e3..e265c2f3a64061b02a963dc8e8f01a28900b0c49 100644 (file)
--- a/tests/unit/sortable/sortable_tickets.js
+++ b/tests/unit/sortable/sortable_tickets.js
@@ -3,6 +3,23 @@
  */
 (function($) {
 
+var el, offsetBefore, offsetAfter, dragged;
+
+var drag = function(handle, dx, dy) {
+       offsetBefore = $(handle).offset();
+       $(handle).simulate("drag", {
+               dx: dx || 0,
+               dy: dy || 0
+       });
+       dragged = { dx: dx, dy: dy };
+       offsetAfter = $(handle).offset();
+}
+
+var sort = function(handle, dx, dy, index, msg) {
+       drag(handle, dx, dy);
+       equals($(handle).parent().children().index(handle), index, msg);
+}
+
 module("sortable: tickets");
 
 test("#3019: Stop fires too early", function() {