jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/365039 )
Change subject: build: Upgrade QUnit to 2.x
......................................................................
build: Upgrade QUnit to 2.x
karma-qunit 1.0.0 → 1.2.1
qunitjs 1.23.1 → 2.4.0
Bug: T170585
Change-Id: I76777cd5ff96d13588b8bc25744bb41402a495cd
---
M package.json
M tests/init/ve.init.sa.Platform.test.js
M tests/ve.test.utils.js
3 files changed, 10 insertions(+), 10 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
Jforrester: Looks good to me, but someone else must approve
diff --git a/package.json b/package.json
index 9ac2929..2861be3 100644
--- a/package.json
+++ b/package.json
@@ -40,8 +40,8 @@
"karma-firefox-launcher": "1.0.0",
"karma-coverage": "1.1.1",
"karma-mocha-reporter": "2.2.3",
- "karma-qunit": "1.0.0",
- "qunitjs": "1.23.1",
+ "karma-qunit": "1.2.1",
+ "qunitjs": "2.4.0",
"stylelint": "7.8.0",
"stylelint-config-wikimedia": "0.4.1"
}
diff --git a/tests/init/ve.init.sa.Platform.test.js
b/tests/init/ve.init.sa.Platform.test.js
index bdc2fdd..5865a9a 100644
--- a/tests/init/ve.init.sa.Platform.test.js
+++ b/tests/init/ve.init.sa.Platform.test.js
@@ -7,7 +7,7 @@
QUnit.module( 've.init.sa.Platform', ( function () {
var dummyPlatform;
return {
- setup: function () {
+ beforeEach: function () {
// Ensure that ve.init.platform is not permanently
overwritten
// by creating an sa.Platform
dummyPlatform = ve.init.platform;
@@ -25,7 +25,7 @@
};
this.purgeKeys();
},
- teardown: function () {
+ afterEach: function () {
ve.init.platform = dummyPlatform;
this.purgeKeys();
}
diff --git a/tests/ve.test.utils.js b/tests/ve.test.utils.js
index e0ee772..a868cc2 100644
--- a/tests/ve.test.utils.js
+++ b/tests/ve.test.utils.js
@@ -62,18 +62,18 @@
QUnit.module = function ( name, localEnv ) {
localEnv = localEnv || {};
orgModule( name, {
- setup: function () {
+ beforeEach: function () {
this.fixture = document.createElement(
'div' );
this.fixture.id = 'qunit-fixture';
document.body.appendChild( this.fixture
);
- if ( localEnv.setup ) {
- localEnv.setup.call( this );
+ if ( localEnv.beforeEach ) {
+ localEnv.beforeEach.call( this
);
}
},
- teardown: function () {
- if ( localEnv.teardown ) {
- localEnv.teardown.call( this );
+ afterEach: function () {
+ if ( localEnv.afterEach ) {
+ localEnv.afterEach.call( this );
}
this.fixture.parentNode.removeChild(
this.fixture );
--
To view, visit https://gerrit.wikimedia.org/r/365039
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I76777cd5ff96d13588b8bc25744bb41402a495cd
Gerrit-PatchSet: 2
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester <[email protected]>
Gerrit-Reviewer: DLynch <[email protected]>
Gerrit-Reviewer: Esanders <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
