[MediaWiki-commits] [Gerrit] mediawiki/core[master]: mediawiki.toc: Migrate test from deprecated asyncTest()

2017-07-14 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/364515 )

Change subject: mediawiki.toc: Migrate test from deprecated asyncTest()
..


mediawiki.toc: Migrate test from deprecated asyncTest()

Instead, use assert.async(), or (in this case) return the Promise directly
to QUnit.test, which will naturally await it.
As bonus, it'll handle errors, too. (instead of timing out)

Change-Id: I94ee0bf72a3d8ac2e588cd75cbe0787b5001d5b4
---
M tests/qunit/suites/resources/mediawiki/mediawiki.toc.test.js
1 file changed, 3 insertions(+), 5 deletions(-)

Approvals:
  jenkins-bot: Verified
  Jforrester: Looks good to me, approved



diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.toc.test.js 
b/tests/qunit/suites/resources/mediawiki/mediawiki.toc.test.js
index 477550b..b20b68f 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.toc.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.toc.test.js
@@ -6,7 +6,7 @@
}
} ) );
 
-   QUnit.asyncTest( 'toggleToc', function ( assert ) {
+   QUnit.test( 'toggleToc', function ( assert ) {
var tocHtml, $toc, $toggleLink, $tocList;
 
assert.strictEqual( $( '.toc' ).length, 0, 'There is no table 
of contents on the page at the beginning' );
@@ -29,13 +29,11 @@
assert.strictEqual( $tocList.is( ':hidden' ), false, 'The table 
of contents is now visible' );
 
$toggleLink.click();
-   $tocList.promise().done( function () {
+   return $tocList.promise().then( function () {
assert.strictEqual( $tocList.is( ':hidden' ), true, 
'The table of contents is now hidden' );
 
$toggleLink.click();
-   $tocList.promise().done( function () {
-   QUnit.start();
-   } );
+   return $tocList.promise();
} );
} );
 }( mediaWiki, jQuery ) );

-- 
To view, visit https://gerrit.wikimedia.org/r/364515
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I94ee0bf72a3d8ac2e588cd75cbe0787b5001d5b4
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Gilles 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: mediawiki.toc: Migrate test from deprecated asyncTest()

2017-07-11 Thread Krinkle (Code Review) 
Krinkle has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/364515 )

Change subject: mediawiki.toc: Migrate test from deprecated asyncTest()
..

mediawiki.toc: Migrate test from deprecated asyncTest()

Instead, use assert.async(), or (in this case) return the Promise directly
to QUnit.test, which will naturally await it.
As bonus, it'll handle errors, too. (instead of timing out)

Change-Id: I94ee0bf72a3d8ac2e588cd75cbe0787b5001d5b4
---
M tests/qunit/suites/resources/mediawiki/mediawiki.toc.test.js
1 file changed, 3 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/15/364515/1

diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.toc.test.js 
b/tests/qunit/suites/resources/mediawiki/mediawiki.toc.test.js
index 477550b..b20b68f 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.toc.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.toc.test.js
@@ -6,7 +6,7 @@
}
} ) );
 
-   QUnit.asyncTest( 'toggleToc', function ( assert ) {
+   QUnit.test( 'toggleToc', function ( assert ) {
var tocHtml, $toc, $toggleLink, $tocList;
 
assert.strictEqual( $( '.toc' ).length, 0, 'There is no table 
of contents on the page at the beginning' );
@@ -29,13 +29,11 @@
assert.strictEqual( $tocList.is( ':hidden' ), false, 'The table 
of contents is now visible' );
 
$toggleLink.click();
-   $tocList.promise().done( function () {
+   return $tocList.promise().then( function () {
assert.strictEqual( $tocList.is( ':hidden' ), true, 
'The table of contents is now hidden' );
 
$toggleLink.click();
-   $tocList.promise().done( function () {
-   QUnit.start();
-   } );
+   return $tocList.promise();
} );
} );
 }( mediaWiki, jQuery ) );

-- 
To view, visit https://gerrit.wikimedia.org/r/364515
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I94ee0bf72a3d8ac2e588cd75cbe0787b5001d5b4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits