From: Timo Tijhof Date: Thu, 6 Mar 2014 03:02:18 +0000 (+0100) Subject: jquery.makeCollapsible.test: Use fake timers to advance animations X-Git-Tag: 1.31.0-rc.0~16440^2 X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_aide%28?a=commitdiff_plain;h=7d04d8cfe8d67fded6291890f5a9d7e9da9b18ce;p=lhc%2Fweb%2Fwiklou.git jquery.makeCollapsible.test: Use fake timers to advance animations This is essentially a headless test. No point in slowing down the QUnit run with dozens of gaps where we wait for 400ms for some jQuery fade animation to run to completion. On Chrome 33, this reduced run time for jquery.makeCollapsible tests from 7631ms to 179ms. Change-Id: I3723329fc0139da631bd047cb720bab1c2f754d9 --- diff --git a/tests/qunit/suites/resources/jquery/jquery.makeCollapsible.test.js b/tests/qunit/suites/resources/jquery/jquery.makeCollapsible.test.js index e6a6124843..804058193b 100644 --- a/tests/qunit/suites/resources/jquery/jquery.makeCollapsible.test.js +++ b/tests/qunit/suites/resources/jquery/jquery.makeCollapsible.test.js @@ -1,7 +1,11 @@ ( function ( mw, $ ) { var loremIpsum = 'Lorem ipsum dolor sit amet, consectetuer adipiscing elit.'; - QUnit.module( 'jquery.makeCollapsible', QUnit.newMwEnvironment() ); + QUnit.module( 'jquery.makeCollapsible', QUnit.newMwEnvironment( { + setup: function () { + this.clock = this.sandbox.useFakeTimers(); + } + } ) ); function prepareCollapsible( html, options ) { return $( $.parseHTML( html ) ) @@ -11,8 +15,9 @@ } // This test is first because if it fails, then almost all of the latter tests are meaningless. - QUnit.asyncTest( 'testing hooks/triggers', 4, function ( assert ) { - var $collapsible = prepareCollapsible( + QUnit.test( 'testing hooks/triggers', 4, function ( assert ) { + var test = this, + $collapsible = prepareCollapsible( '
' + loremIpsum + '
' ), $content = $collapsible.find( '.mw-collapsible-content' ), @@ -33,19 +38,21 @@ } ); $collapsible.on( 'afterExpand.mw-collapsible', function () { assert.assertTrue( $content.is( ':visible' ), 'second afterCollapseExpand: content is visible' ); - QUnit.start(); } ); // ...expanding happens here $toggle.trigger( 'click' ); + test.clock.tick( 500 ); } ); // ...collapsing happens here $toggle.trigger( 'click' ); + test.clock.tick( 500 ); } ); - QUnit.asyncTest( 'basic operation (
)', 5, function ( assert ) { - var $collapsible = prepareCollapsible( + QUnit.test( 'basic operation (
)', 5, function ( assert ) { + var test = this, + $collapsible = prepareCollapsible( '
' + loremIpsum + '
' ), $content = $collapsible.find( '.mw-collapsible-content' ), @@ -61,17 +68,19 @@ $collapsible.on( 'afterExpand.mw-collapsible', function () { assert.assertTrue( $content.is( ':visible' ), 'after expanding: content is visible' ); - QUnit.start(); } ); $toggle.trigger( 'click' ); + test.clock.tick( 500 ); } ); $toggle.trigger( 'click' ); + test.clock.tick( 500 ); } ); - QUnit.asyncTest( 'basic operation ()', 7, function ( assert ) { - var $collapsible = prepareCollapsible( + QUnit.test( 'basic operation (
)', 7, function ( assert ) { + var test = this, + $collapsible = prepareCollapsible( '
' + '' + '' + @@ -94,16 +103,17 @@ $collapsible.on( 'afterExpand.mw-collapsible', function () { assert.assertTrue( $headerRow.is( ':visible' ), 'after expanding: headerRow is still visible' ); assert.assertTrue( $contentRow.is( ':visible' ), 'after expanding: contentRow is visible' ); - QUnit.start(); } ); $toggle.trigger( 'click' ); + test.clock.tick( 500 ); } ); $toggle.trigger( 'click' ); + test.clock.tick( 500 ); } ); - function tableWithCaptionTest( $collapsible, assert ) { + function tableWithCaptionTest( $collapsible, test, assert ) { var $caption = $collapsible.find( 'caption' ), $headerRow = $collapsible.find( 'tr:first' ), $contentRow = $collapsible.find( 'tr:last' ), @@ -124,16 +134,17 @@ assert.assertTrue( $caption.is( ':visible' ), 'after expanding: caption is still visible' ); assert.assertTrue( $headerRow.is( ':visible' ), 'after expanding: headerRow is visible' ); assert.assertTrue( $contentRow.is( ':visible' ), 'after expanding: contentRow is visible' ); - QUnit.start(); } ); $toggle.trigger( 'click' ); + test.clock.tick( 500 ); } ); $toggle.trigger( 'click' ); + test.clock.tick( 500 ); } - QUnit.asyncTest( 'basic operation (
' + loremIpsum + '' + loremIpsum + '
' + loremIpsum + '' + loremIpsum + '
with caption)', 10, function ( assert ) { + QUnit.test( 'basic operation (
with caption)', 10, function ( assert ) { tableWithCaptionTest( prepareCollapsible( '
' + '' + @@ -141,10 +152,10 @@ '' + '' + '
' + loremIpsum + '
' + loremIpsum + '' + loremIpsum + '
' + loremIpsum + '' + loremIpsum + '
' - ), assert ); + ), this, assert ); } ); - QUnit.asyncTest( 'basic operation ( with caption and )', 10, function ( assert ) { + QUnit.test( 'basic operation (
with caption and )', 10, function ( assert ) { tableWithCaptionTest( prepareCollapsible( '
' + '' + @@ -152,10 +163,10 @@ '' + '' + '
' + loremIpsum + '
' + loremIpsum + '' + loremIpsum + '
' + loremIpsum + '' + loremIpsum + '
' - ), assert ); + ), this, assert ); } ); - function listTest( listType, assert ) { + function listTest( listType, test, assert ) { var $collapsible = prepareCollapsible( '<' + listType + ' class="mw-collapsible">' + '
  • ' + loremIpsum + '
    • ' + @@ -178,21 +189,22 @@ $collapsible.on( 'afterExpand.mw-collapsible', function () { assert.assertTrue( $toggleItem.is( ':visible' ), 'after expanding: toggleItem is still visible' ); assert.assertTrue( $contentItem.is( ':visible' ), 'after expanding: contentItem is visible' ); - QUnit.start(); } ); $toggle.trigger( 'click' ); + test.clock.tick( 500 ); } ); $toggle.trigger( 'click' ); + test.clock.tick( 500 ); } - QUnit.asyncTest( 'basic operation (
      )', 7, function ( assert ) { - listTest( 'ul', assert ); + QUnit.test( 'basic operation (
        )', 7, function ( assert ) { + listTest( 'ul', this, assert ); } ); - QUnit.asyncTest( 'basic operation (
          )', 7, function ( assert ) { - listTest( 'ol', assert ); + QUnit.test( 'basic operation (
            )', 7, function ( assert ) { + listTest( 'ol', this, assert ); } ); QUnit.test( 'basic operation when synchronous (options.instantHide)', 2, function ( assert ) { @@ -234,7 +246,7 @@ assert.assertTrue( $collapsible.hasClass( 'mw-collapsed' ), 'mw-collapsed class present' ); } ); - QUnit.asyncTest( 'initial collapse (mw-collapsed class)', 2, function ( assert ) { + QUnit.test( 'initial collapse (mw-collapsed class)', 2, function ( assert ) { var $collapsible = prepareCollapsible( '
            ' + loremIpsum + '
            ' ), @@ -245,13 +257,13 @@ $collapsible.on( 'afterExpand.mw-collapsible', function () { assert.assertTrue( $content.is( ':visible' ), 'after expanding: content is visible' ); - QUnit.start(); } ); $collapsible.find( '.mw-collapsible-toggle' ).trigger( 'click' ); + this.clock.tick( 500 ); } ); - QUnit.asyncTest( 'initial collapse (options.collapsed)', 2, function ( assert ) { + QUnit.test( 'initial collapse (options.collapsed)', 2, function ( assert ) { var $collapsible = prepareCollapsible( '
            ' + loremIpsum + '
            ', { collapsed: true } @@ -263,10 +275,10 @@ $collapsible.on( 'afterExpand.mw-collapsible', function () { assert.assertTrue( $content.is( ':visible' ), 'after expanding: content is visible' ); - QUnit.start(); } ); $collapsible.find( '.mw-collapsible-toggle' ).trigger( 'click' ); + this.clock.tick( 500 ); } ); QUnit.test( 'clicks on links inside toggler pass through (options.linksPassthru)', 2, function ( assert ) { @@ -289,7 +301,7 @@ assert.assertTrue( $content.is( ':hidden' ), 'click event on non-link inside toggle toggles content' ); } ); - QUnit.asyncTest( 'collapse/expand text (data-collapsetext, data-expandtext)', 2, function ( assert ) { + QUnit.test( 'collapse/expand text (data-collapsetext, data-expandtext)', 2, function ( assert ) { var $collapsible = prepareCollapsible( '
            ' + loremIpsum + @@ -301,13 +313,13 @@ $collapsible.on( 'afterCollapse.mw-collapsible', function () { assert.equal( $toggleLink.text(), 'Expand me!', 'data-expandtext is respected' ); - QUnit.start(); } ); $collapsible.find( '.mw-collapsible-toggle' ).trigger( 'click' ); + this.clock.tick( 500 ); } ); - QUnit.asyncTest( 'collapse/expand text (options.collapseText, options.expandText)', 2, function ( assert ) { + QUnit.test( 'collapse/expand text (options.collapseText, options.expandText)', 2, function ( assert ) { var $collapsible = prepareCollapsible( '
            ' + loremIpsum + '
            ', { collapseText: 'Collapse me!', expandText: 'Expand me!' } @@ -318,10 +330,10 @@ $collapsible.on( 'afterCollapse.mw-collapsible', function () { assert.equal( $toggleLink.text(), 'Expand me!', 'options.expandText is respected' ); - QUnit.start(); } ); $collapsible.find( '.mw-collapsible-toggle' ).trigger( 'click' ); + this.clock.tick( 500 ); } ); }( mediaWiki, jQuery ) );