diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/lib/helper.js | 59 | ||||
| -rw-r--r-- | tests/lib/qunit.js | 23 | ||||
| -rw-r--r-- | tests/lib/testIframe.js | 7 | ||||
| -rw-r--r-- | tests/unit/spinner/core.js | 14 | ||||
| -rw-r--r-- | tests/unit/spinner/mousewheel-wheel.html | 72 |
5 files changed, 167 insertions, 8 deletions
diff --git a/tests/lib/helper.js b/tests/lib/helper.js index 2315c5e19..2be4c48de 100644 --- a/tests/lib/helper.js +++ b/tests/lib/helper.js @@ -51,6 +51,65 @@ exports.moduleAfterEach = function( assert ) { } }; +exports.testIframe = function( title, fileName, func, wrapper, iframeStyles ) { + if ( !wrapper ) { + wrapper = QUnit.test; + } + wrapper.call( QUnit, title, function( assert ) { + var done = assert.async(), + $iframe = jQuery( "<iframe></iframe>" ) + .css( { + position: "absolute", + top: "0", + left: "-600px", + width: "500px", + zIndex: 1, + background: "white" + } ) + .attr( { id: "qunit-fixture-iframe", src: fileName } ); + + // Add other iframe styles + if ( iframeStyles ) { + $iframe.css( iframeStyles ); + } + + // Test iframes are expected to invoke this via startIframeTest + // (cf. iframeTest.js) + window.iframeCallback = function() { + var args = Array.prototype.slice.call( arguments ); + + args.unshift( assert ); + + setTimeout( function() { + var result; + + this.iframeCallback = undefined; + + result = func.apply( this, args ); + + function finish() { + func = function() {}; + $iframe.remove(); + done(); + } + + // Wait for promises returned by `func`. + if ( result && result.then ) { + result.then( finish ); + } else { + finish(); + } + } ); + }; + + // Attach iframe to the body for visibility-dependent code. + // It will be removed by either the above code, or the testDone + // callback in qunit.js. + $iframe.prependTo( document.body ); + } ); +}; +window.iframeCallback = undefined; + return exports; } ); diff --git a/tests/lib/qunit.js b/tests/lib/qunit.js index 6441019bd..c4c96ef58 100644 --- a/tests/lib/qunit.js +++ b/tests/lib/qunit.js @@ -7,6 +7,8 @@ define( [ ], function( QUnit, $ ) { "use strict"; +var ajaxSettings = $.ajaxSettings; + QUnit.config.autostart = false; QUnit.config.requireExpects = true; @@ -34,16 +36,21 @@ QUnit.config.urlConfig.push( { label: "Enable jquery-migrate" } ); -QUnit.reset = ( function( reset ) { - return function() { +QUnit.testDone( function() { + + // Ensure jQuery events and data on the fixture are properly removed + $( "#qunit-fixture" ).empty(); - // Ensure jQuery events and data on the fixture are properly removed - $( "#qunit-fixture" ).empty(); + // Remove the iframe fixture + $( "#qunit-fixture-iframe" ).remove(); - // Let QUnit reset the fixture - reset.apply( this, arguments ); - }; -} )( QUnit.reset ); + // Reset internal $ state + if ( ajaxSettings ) { + $.ajaxSettings = $.extend( true, {}, ajaxSettings ); + } else { + delete $.ajaxSettings; + } +} ); return QUnit; diff --git a/tests/lib/testIframe.js b/tests/lib/testIframe.js new file mode 100644 index 000000000..4db56833c --- /dev/null +++ b/tests/lib/testIframe.js @@ -0,0 +1,7 @@ +window.startIframeTest = function() { + var args = Array.prototype.slice.call( arguments ); + + // Note: jQuery may be undefined if page did not load it + args.unshift( window.jQuery, window, document ); + window.parent.iframeCallback.apply( null, args ); +}; diff --git a/tests/unit/spinner/core.js b/tests/unit/spinner/core.js index befe439f6..42bcc7bb5 100644 --- a/tests/unit/spinner/core.js +++ b/tests/unit/spinner/core.js @@ -239,6 +239,20 @@ QUnit.test( "mousewheel on input (DEPRECATED)", function( assert ) { } } ); +helper.testIframe( + "wheel & mousewheel conflicts", + "mousewheel-wheel.html", + function( assert, jQuery, window, document, values ) { + assert.expect( 5 ); + + assert.equal( values[ 0 ], 0, "wheel event without delta does not change value" ); + assert.equal( values[ 1 ], 2, "delta -1" ); + assert.equal( values[ 2 ], 0, "delta 0.2" ); + assert.equal( values[ 3 ], -2, "delta 15" ); + assert.equal( values[ 4 ], -2, "wheel when not focused" ); + } +); + QUnit.test( "reading HTML5 attributes", function( assert ) { assert.expect( 6 ); var markup = "<input type='number' min='-100' max='100' value='5' step='2'>", diff --git a/tests/unit/spinner/mousewheel-wheel.html b/tests/unit/spinner/mousewheel-wheel.html new file mode 100644 index 000000000..e512a36cc --- /dev/null +++ b/tests/unit/spinner/mousewheel-wheel.html @@ -0,0 +1,72 @@ +<!doctype html> +<html lang="en"> +<head> + <meta charset="utf-8"> + <title>jQuery UI Spinner Test Suite</title> + + <script src="../../../external/requirejs/require.js"></script> + <script src="../../../external/jquery/jquery.js"></script> + <script src="../../lib/css.js" data-modules="core button spinner theme"></script> + <script src="../../lib/testIframe.js"></script> +</head> +<body> + +<input id="spin" class="foo"> + +<script> + function runTest() { + var values = [], + element = $( "#spin" ).val( 0 ).spinner( { + step: 2 + } ); + + element.focus(); + setTimeout( step1 ); + + function dispatchWheelEvent( elem, deltaY ) { + elem[ 0 ].dispatchEvent( new WheelEvent( "wheel", { + deltaY: deltaY + } ) ); + } + + function step1() { + dispatchWheelEvent( element ); + values.push( element.val() ); + + dispatchWheelEvent( element, -1 ); + values.push( element.val() ); + + dispatchWheelEvent( element, 0.2 ); + values.push( element.val() ); + + dispatchWheelEvent( element, 15 ); + values.push( element.val() ); + + element.blur(); + setTimeout( step2 ); + } + + function step2() { + dispatchWheelEvent( element, -1 ); + values.push( element.val() ); + + startIframeTest( values ); + } + } + + requirejs.config( { + paths: { + "jquery-mousewheel": "../../../external/jquery-mousewheel/jquery.mousewheel", + "ui": "../../../ui" + }, + } ); + + require( [ + "jquery-mousewheel", + "ui/widgets/spinner" + ], function() { + runTest(); + } ); +</script> +</body> +</html> |