Jforrester has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/365682 )
Change subject: tests: Make VisualEditor-MediaWiki compatible with QUnit 2 ...................................................................... tests: Make VisualEditor-MediaWiki compatible with QUnit 2 Replacing QUnit.setup()/QUnit.teardown() with the already-available- in-qunit-1.x QUnit.beforeEach()/QUnit.afterEach() methods. Bug: T170872 Change-Id: I5bfca33c1d4d920d54c2c54b483be78c61b6d0d7 --- M modules/ve-mw/tests/ui/datatransferhandlers/ve.ui.MWWikitextStringTransferHandler.test.js M modules/ve-mw/tests/ve.test.utils.js 2 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/82/365682/1 diff --git a/modules/ve-mw/tests/ui/datatransferhandlers/ve.ui.MWWikitextStringTransferHandler.test.js b/modules/ve-mw/tests/ui/datatransferhandlers/ve.ui.MWWikitextStringTransferHandler.test.js index f6eda3e..1c736e8 100644 --- a/modules/ve-mw/tests/ui/datatransferhandlers/ve.ui.MWWikitextStringTransferHandler.test.js +++ b/modules/ve-mw/tests/ui/datatransferhandlers/ve.ui.MWWikitextStringTransferHandler.test.js @@ -7,12 +7,12 @@ window.MWWIKITEXT_MOCK_API = true; QUnit.module( 've.ui.MWWikitextStringTransferHandler', QUnit.newMwEnvironment( { - setup: function () { + beforeEach: function () { // Mock XHR for mw.Api() this.server = window.MWWIKITEXT_MOCK_API ? this.sandbox.useFakeServer() : null; ve.test.utils.mwEnvironment.setup.call( this ); }, - teardown: ve.test.utils.mwEnvironment.teardown + afterEach: ve.test.utils.mwEnvironment.teardown } ) ); /* Tests */ diff --git a/modules/ve-mw/tests/ve.test.utils.js b/modules/ve-mw/tests/ve.test.utils.js index b140dae..907f006 100644 --- a/modules/ve-mw/tests/ve.test.utils.js +++ b/modules/ve-mw/tests/ve.test.utils.js @@ -96,8 +96,8 @@ teardownOverrides(); return QUnit.newMwEnvironment( { - setup: setupOverrides, - teardown: teardownOverrides + beforeEach: setupOverrides, + afterEach: teardownOverrides } ); }() ); -- To view, visit https://gerrit.wikimedia.org/r/365682 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5bfca33c1d4d920d54c2c54b483be78c61b6d0d7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Jforrester <jforres...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits