diff options
| author | Mike Sherov <mike.sherov@gmail.com> | 2013-04-07 12:10:59 -0400 |
|---|---|---|
| committer | Scott González <scott.gonzalez@gmail.com> | 2013-04-17 15:24:13 -0400 |
| commit | 17ce0a5cb0e6f85a73ca4b573217618271e6c3c8 (patch) | |
| tree | bf542f65b80f8e0f29f9cb00bded31a99768e366 /tests | |
| parent | 2258e02e76ea20005e5e79a64d3e8bc071319052 (diff) | |
| download | jquery-ui-17ce0a5cb0e6f85a73ca4b573217618271e6c3c8.tar.gz jquery-ui-17ce0a5cb0e6f85a73ca4b573217618271e6c3c8.zip | |
Draggable Tests: fix old Safari and old Opera tests with jQuery < 1.8 tests by accounting for a bug in $.contains on disconnected Elements.(cherry picked from commit 3c1a3ca252a24f63ab7f4ac819cc7744eaf57c77)
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/unit/draggable/draggable_options.js | 12 | ||||
| -rw-r--r-- | tests/unit/draggable/draggable_test_helpers.js | 5 |
2 files changed, 14 insertions, 3 deletions
diff --git a/tests/unit/draggable/draggable_options.js b/tests/unit/draggable/draggable_options.js index 6a0cd593b..635d318e7 100644 --- a/tests/unit/draggable/draggable_options.js +++ b/tests/unit/draggable/draggable_options.js @@ -1289,9 +1289,15 @@ test( "#8459: element can snap to an element that was removed during drag", func 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 to a removed element" ); - closeEnough( element.offset().top, newY, 1, "doesn't snap to a removed element" ); + // 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() { diff --git a/tests/unit/draggable/draggable_test_helpers.js b/tests/unit/draggable/draggable_test_helpers.js index 44e37c559..246175604 100644 --- a/tests/unit/draggable/draggable_test_helpers.js +++ b/tests/unit/draggable/draggable_test_helpers.js @@ -1,6 +1,11 @@ TestHelpers.draggable = { // todo: remove the unreliable offset hacks unreliableOffset: $.ui.ie && ( !document.documentMode || document.documentMode < 8 ) ? 2 : 0, + // Support: Opera 12.10, Safari 5.1, jQuery <1.8 + unreliableContains: function(){ + var element = $( "<div>" ); + return $.contains( element[ 0 ].ownerDocument, element[ 0 ] ); + }(), testDrag: function(el, handle, dx, dy, expectedDX, expectedDY, msg) { var offsetAfter, actual, expected, offsetBefore = el.offset(); |