diff options
Diffstat (limited to 'tests/unit/selectable')
| -rw-r--r-- | tests/unit/selectable/selectable.html | 11 | ||||
| -rw-r--r-- | tests/unit/selectable/selectable_common.js | 1 | ||||
| -rw-r--r-- | tests/unit/selectable/selectable_core.js | 15 | ||||
| -rw-r--r-- | tests/unit/selectable/selectable_events.js | 8 | ||||
| -rw-r--r-- | tests/unit/selectable/selectable_methods.js | 22 | ||||
| -rw-r--r-- | tests/unit/selectable/selectable_options.js | 25 | ||||
| -rw-r--r-- | tests/unit/selectable/selectable_test_helpers.js | 8 |
7 files changed, 39 insertions, 51 deletions
diff --git a/tests/unit/selectable/selectable.html b/tests/unit/selectable/selectable.html index 7b0ca6ffe..13718e1f3 100644 --- a/tests/unit/selectable/selectable.html +++ b/tests/unit/selectable/selectable.html @@ -26,17 +26,8 @@ <script src="selectable_events.js"></script> <script src="selectable_methods.js"></script> <script src="selectable_options.js"></script> + <script src="selectable_test_helpers.js"></script> - <script> - // disable this stale testsuite for testswarm only - var url = window.location.search; - url = decodeURIComponent( url.slice( url.indexOf("swarmURL=") + 9 ) ); - if ( url && url.indexOf("http") == 0 ) { - // reset config to kill previous tests; make sure testsuite.js is loaded afterwards to init the testswarm script - QUnit.init(); - test("selectable", function() { ok(true, "disabled selectable testsuite"); }); - } - </script> <script src="../swarminject.js"></script> </head> <body> diff --git a/tests/unit/selectable/selectable_common.js b/tests/unit/selectable/selectable_common.js index 885e79401..aee6a15ac 100644 --- a/tests/unit/selectable/selectable_common.js +++ b/tests/unit/selectable/selectable_common.js @@ -3,6 +3,7 @@ TestHelpers.commonWidgetTests('selectable', { appendTo: 'body', autoRefresh: true, cancel: 'input,textarea,button,select,option', + create: null, delay: 0, disabled: false, distance: 0, diff --git a/tests/unit/selectable/selectable_core.js b/tests/unit/selectable/selectable_core.js index 18ea3a302..9953b6c07 100644 --- a/tests/unit/selectable/selectable_core.js +++ b/tests/unit/selectable/selectable_core.js @@ -1,16 +1,3 @@ /* * selectable_core.js - */ - -var el; - -var drag = function(dx, dy) { - var off = el.offset(), pos = { clientX: off.left, clientY: off.top }; - el.simulate("mousedown", pos); - $(document).simulate("mousemove", pos); - pos.clientX += dx; - pos.clientY += dy; - $(document).simulate("mousemove", pos); - $(document).simulate("mouseup", pos); -}; - + */
\ No newline at end of file diff --git a/tests/unit/selectable/selectable_events.js b/tests/unit/selectable/selectable_events.js index 2623818a7..331bae146 100644 --- a/tests/unit/selectable/selectable_events.js +++ b/tests/unit/selectable/selectable_events.js @@ -7,9 +7,9 @@ module("selectable: events"); test("start", function() { expect(2); - el = $("#selectable1"); + var el = $("#selectable1"); el.selectable({ - start: function(ev, ui) { + start: function() { ok(true, "drag fired start callback"); equal(this, el[0], "context of callback"); } @@ -19,9 +19,9 @@ test("start", function() { test("stop", function() { expect(2); - el = $("#selectable1"); + var el = $("#selectable1"); el.selectable({ - start: function(ev, ui) { + start: function() { ok(true, "drag fired stop callback"); equal(this, el[0], "context of callback"); } diff --git a/tests/unit/selectable/selectable_methods.js b/tests/unit/selectable/selectable_methods.js index dbc88f269..aa8924176 100644 --- a/tests/unit/selectable/selectable_methods.js +++ b/tests/unit/selectable/selectable_methods.js @@ -6,7 +6,7 @@ module("selectable: methods"); test("init", function() { - expect(6); + expect( 5 ); $("<div></div>").appendTo('body').selectable().remove(); ok(true, '.selectable() called on element'); @@ -17,11 +17,8 @@ test("init", function() { $("<div></div>").selectable().remove(); ok(true, '.selectable() called on disconnected DOMElement'); - $("<div></div>").selectable().selectable("foo").remove(); - ok(true, 'arbitrary method called after init'); - - el = $("<div></div>").selectable(); - var foo = el.selectable("option", "foo"); + var el = $("<div></div>").selectable(); + el.selectable("option", "foo"); el.remove(); ok(true, 'arbitrary option getter after init'); @@ -30,6 +27,8 @@ test("init", function() { }); test("destroy", function() { + expect( 4 ); + $("<div></div>").appendTo('body').selectable().selectable("destroy").remove(); ok(true, '.selectable("destroy") called on element'); @@ -39,9 +38,6 @@ test("destroy", function() { $("<div></div>").selectable().selectable("destroy").remove(); ok(true, '.selectable("destroy") called on disconnected DOMElement'); - $("<div></div>").selectable().selectable("destroy").selectable("foo").remove(); - ok(true, 'arbitrary method called after destroy'); - var expected = $('<div></div>').selectable(), actual = expected.selectable('destroy'); equal(actual, expected, 'destroy is chainable'); @@ -50,9 +46,9 @@ test("destroy", function() { test("enable", function() { expect(3); var expected, actual, - fired = false; + fired = false, + el = $("#selectable1"); - el = $("#selectable1"); el.selectable({ disabled: true, start: function() { fired = true; } @@ -72,9 +68,9 @@ test("enable", function() { test("disable", function() { expect(3); var expected, actual, - fired = false; + fired = false, + el = $("#selectable1"); - el = $("#selectable1"); el.selectable({ disabled: false, start: function() { fired = true; } diff --git a/tests/unit/selectable/selectable_options.js b/tests/unit/selectable/selectable_options.js index be9fdf5fe..50e047427 100644 --- a/tests/unit/selectable/selectable_options.js +++ b/tests/unit/selectable/selectable_options.js @@ -7,13 +7,15 @@ module("selectable: options"); test("autoRefresh", function() { expect(3); - el = $("#selectable1"); - var actual, sel = $("*", el), selected = function() { actual += 1; }; - actual = 0; + var actual = 0, + el = $("#selectable1"), + sel = $("*", el), + selected = function() { actual += 1; }; + el = $("#selectable1").selectable({ autoRefresh: false, selected: selected }); sel.hide(); - drag(1000, 1000); + TestHelpers.selectable.drag(el, 1000, 1000); equal(actual, sel.length); el.selectable("destroy"); @@ -21,10 +23,10 @@ test("autoRefresh", function() { sel.show(); el = $("#selectable1").selectable({ autoRefresh: true, selected: selected }); sel.hide(); - drag(1000, 1000); + TestHelpers.selectable.drag(el, 1000, 1000); equal(actual, 0); sel.show(); - drag(1000, 1000); + TestHelpers.selectable.drag( sel[ 0 ], 1000, 1000 ); equal(actual, sel.length); el.selectable("destroy"); sel.show(); @@ -32,12 +34,15 @@ test("autoRefresh", function() { test("filter", function() { expect(2); - el = $("#selectable1"); - var actual, sel = $("*", el), selected = function() { actual += 1; }; - actual = 0; + var actual =0, + el = $("#selectable1"), + sel = $("*", el), + selected = function() { actual += 1; }; + + el = $("#selectable1").selectable({ filter: '.special', selected: selected }); - drag(1000, 1000); + TestHelpers.selectable.drag(el, 1000, 1000); ok(sel.length !== 1, "this test assumes more than 1 selectee"); equal(actual, 1); el.selectable("destroy"); diff --git a/tests/unit/selectable/selectable_test_helpers.js b/tests/unit/selectable/selectable_test_helpers.js new file mode 100644 index 000000000..6f87efbb3 --- /dev/null +++ b/tests/unit/selectable/selectable_test_helpers.js @@ -0,0 +1,8 @@ +TestHelpers.selectable = { + drag: function( el, dx, dy ) { + $( el ).simulate( "drag", { + dx: dx || 0, + dy: dy || 0 + }); + } +};
\ No newline at end of file |