From: Bartosz Dziewoński <matma.rex@gmail.com>
Date: Thu, 17 Apr 2014 15:14:46 +0000 (+0200)
Subject: mediawiki.toc.test: Cleanup
X-Git-Tag: 1.31.0-rc.0~16175^2
X-Git-Url: https://git.cyclocoop.org/%27.%24link.%27?a=commitdiff_plain;h=996e83ad2ec124a95118fadaaeded2ba3a61ca90;p=lhc%2Fweb%2Fwiklou.git

mediawiki.toc.test: Cleanup

Used consistent wording, fixed some typos ("visible" and "hidden" were
swapped in one place, etc.) and simplified the flow.

Change-Id: I7745aa48484fb1a36f8b2654f2a3df326b43c9c4
---

diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.toc.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.toc.test.js
index a4db0a1751..3f856b96ba 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.toc.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.toc.test.js
@@ -4,23 +4,7 @@
 	QUnit.asyncTest( 'toggleToc', 4, function ( assert ) {
 		var tocHtml, $toggleLink, $tocList;
 
-		function actionC() {
-			QUnit.start();
-		}
-
-		function actionB() {
-			assert.strictEqual( $tocList.is( ':hidden' ), true, 'Return boolean true if the TOC is now visible.' );
-			$toggleLink.click();
-			$tocList.promise().done( actionC );
-		}
-
-		function actionA() {
-			assert.strictEqual( $tocList.is( ':hidden' ), false, 'Return boolean false if the TOC is now hidden.' );
-			$toggleLink.click();
-			$tocList.promise().done( actionB );
-		}
-
-		assert.strictEqual( $( '#toc' ).length, 0, 'Return 0 if there is no table of contents on the page.' );
+		assert.strictEqual( $( '#toc' ).length, 0, 'There is no table of contents on the page at the beginning' );
 
 		tocHtml = '<div id="toc" class="toc">' +
 			'<div id="toctitle">' +
@@ -30,11 +14,22 @@
 			'</div>';
 		$( tocHtml ).appendTo( '#qunit-fixture' );
 		mw.hook( 'wikipage.content' ).fire( $( '#qunit-fixture' ) );
+
 		$tocList = $( '#toc ul:first' );
 		$toggleLink = $( '#togglelink' );
 
-		assert.strictEqual( $toggleLink.length, 1, 'Toggle link is appended to the page.' );
+		assert.strictEqual( $toggleLink.length, 1, 'Toggle link is added to the table of contents' );
+
+		assert.strictEqual( $tocList.is( ':hidden' ), false, 'The table of contents is now visible' );
 
-		actionA();
+		$toggleLink.click();
+		$tocList.promise().done( function () {
+			assert.strictEqual( $tocList.is( ':hidden' ), true, 'The table of contents is now hidden' );
+
+			$toggleLink.click();
+			$tocList.promise().done( function () {
+				QUnit.start();
+			} );
+		} );
 	} );
 }( mediaWiki, jQuery ) );