diff options
| author | Brian J. Dowling <bjd-dev@simplicity.net> | 2014-01-16 21:25:17 +0000 |
|---|---|---|
| committer | Brian J. Dowling <bjd-dev@simplicity.net> | 2014-01-16 21:25:28 +0000 |
| commit | f4423f508ec113b6c58ceabb7d12cdac630e36cd (patch) | |
| tree | 0608f3f6825117c56dc96ea18fafef0525818ad7 | |
| parent | 687089736443ef474e5c9700784e5e1a23f2a552 (diff) | |
| download | jquery-ui-f4423f508ec113b6c58ceabb7d12cdac630e36cd.tar.gz jquery-ui-f4423f508ec113b6c58ceabb7d12cdac630e36cd.zip | |
Tests: Fix draggable_options expected test count to be dynamic
The test count was previously incremented to 8 when normally 6 tests
are run. After figuring out the dynamic test code, I just made the
expect depend on the same array length
Also re-enabled the test in the Gruntfile since it now passes.
| -rw-r--r-- | Gruntfile.js | 2 | ||||
| -rw-r--r-- | tests/unit/draggable/draggable_options.js | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Gruntfile.js b/Gruntfile.js index 31b21d910..60d02efd0 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -182,7 +182,7 @@ grunt.initConfig({ files: expandFiles( "tests/unit/**/*.html" ).filter(function( file ) { // disabling everything that doesn't (quite) work with PhantomJS for now // TODO except for all|index|test, try to include more as we go - return !( /(all|index|test|dialog|tooltip|draggable)\.html$/ ).test( file ); + return !( /(all|index|test|dialog|tooltip)\.html$/ ).test( file ); }) }, jshint: { diff --git a/tests/unit/draggable/draggable_options.js b/tests/unit/draggable/draggable_options.js index 59ec9ce35..f50359f99 100644 --- a/tests/unit/draggable/draggable_options.js +++ b/tests/unit/draggable/draggable_options.js @@ -686,7 +686,8 @@ test( "helper, default, switching after initialization", function() { for ( k in scrollElements ) { (function( position, helper, scrollElements, scrollElementsTitle ){ test( "{ helper: '" + helper + "' }, " + position + ", with scroll offset on " + scrollElementsTitle, function() { - expect( 8 ); + expect( scrollPositions.length * 2 ); + var i, j, element = $( "#draggable1" ).css({ position: position, top: 0, left: 0 }).draggable({ helper: helper, |