Skip to content

Commit b8795e1

Browse files
committed
Draggable Tests: Add position asserts to drag tests
They're currently disabled however due to bugs both in the tests and in the actual widget.
1 parent c9b0e28 commit b8795e1

File tree

4 files changed

+74
-60
lines changed

4 files changed

+74
-60
lines changed

tests/unit/draggable/draggable_core.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,12 @@ test( "element types", function() {
4343
});
4444

4545
test( "No options, relative", function() {
46-
expect( 1 );
46+
expect( 2 );
4747
TestHelpers.draggable.shouldMove( $( "#draggable1" ).draggable(), "no options, relative" );
4848
});
4949

5050
test( "No options, absolute", function() {
51-
expect( 1 );
51+
expect( 2 );
5252
TestHelpers.draggable.shouldMove( $( "#draggable2" ).draggable(), "no options, absolute" );
5353
});
5454

tests/unit/draggable/draggable_methods.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,18 +51,18 @@ test( "destroy", function() {
5151
});
5252

5353
test( "enable", function() {
54-
expect( 7 );
54+
expect( 9 );
5555

5656
element.draggable({ disabled: true });
57-
TestHelpers.draggable.shouldNotMove( element, ".draggable({ disabled: true })" );
57+
TestHelpers.draggable.shouldNotDrag( element, ".draggable({ disabled: true })" );
5858

5959
element.draggable("enable");
6060
TestHelpers.draggable.shouldMove( element, ".draggable('enable')" );
6161
equal( element.draggable( "option", "disabled" ), false, "disabled option getter" );
6262

6363
element.draggable("destroy");
6464
element.draggable({ disabled: true });
65-
TestHelpers.draggable.shouldNotMove( element, ".draggable({ disabled: true })" );
65+
TestHelpers.draggable.shouldNotDrag( element, ".draggable({ disabled: true })" );
6666

6767
element.draggable( "option", "disabled", false );
6868
equal(element.draggable( "option", "disabled" ), false, "disabled option setter" );
@@ -74,13 +74,13 @@ test( "enable", function() {
7474
});
7575

7676
test( "disable", function() {
77-
expect( 10 );
77+
expect( 12 );
7878

7979
element = $( "#draggable2" ).draggable({ disabled: false });
8080
TestHelpers.draggable.shouldMove( element, ".draggable({ disabled: false })" );
8181

8282
element.draggable( "disable" );
83-
TestHelpers.draggable.shouldNotMove( element, ".draggable('disable')" );
83+
TestHelpers.draggable.shouldNotDrag( element, ".draggable('disable')" );
8484
equal( element.draggable( "option", "disabled" ), true, "disabled option getter" );
8585

8686
element.draggable( "destroy" );
@@ -89,7 +89,7 @@ test( "disable", function() {
8989

9090
element.draggable( "option", "disabled", true );
9191
equal( element.draggable( "option", "disabled" ), true, "disabled option setter" );
92-
TestHelpers.draggable.shouldNotMove( element, ".draggable('option', 'disabled', true)" );
92+
TestHelpers.draggable.shouldNotDrag( element, ".draggable('option', 'disabled', true)" );
9393

9494
ok( !element.draggable( "widget" ).hasClass( "ui-state-disabled" ), "element does not get ui-state-disabled" );
9595
ok( !element.draggable( "widget" ).attr( "aria-disabled" ), "element does not get aria-disabled" );

0 commit comments

Comments
 (0)