Bmansurov has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/399361 )
Change subject: Use the new versions of mocha and eslint and their configs
......................................................................
Use the new versions of mocha and eslint and their configs
Change-Id: Ifa503f878f04c2f1868c3b44c4dcab3c5ed7bf9d
---
M lib/queue.js
M lib/swagger-ui.js
M package.json
M test/mocha.opts
4 files changed, 10 insertions(+), 8 deletions(-)
Approvals:
Bmansurov: Verified; Looks good to me, approved
diff --git a/lib/queue.js b/lib/queue.js
index c7fa3f5..5fb4624 100644
--- a/lib/queue.js
+++ b/lib/queue.js
@@ -41,7 +41,7 @@
*/
constructor(queueOptions, puppeteerOptions, pdfOptions, logger) {
this._queueObject = asyncQueue(this._worker.bind(this),
- queueOptions.concurrency);
+ queueOptions.concurrency);
this._puppeteerOptions = puppeteerOptions;
this._pdfOptions = pdfOptions;
this._options = queueOptions;
@@ -128,7 +128,7 @@
{
msg: 'Queue is full, rejecting the request.',
id: data.id,
- queueSize: queueSize
+ queueSize
}
);
callback(callbackErrors.queueFull, null);
@@ -142,7 +142,7 @@
{
msg: 'Job is being added to the queue.',
id: data.id,
- queueSize: queueSize
+ queueSize
}
);
// this time is used for measuring the time task waits in queue
diff --git a/lib/swagger-ui.js b/lib/swagger-ui.js
index 9e39ff5..a85985c 100644
--- a/lib/swagger-ui.js
+++ b/lib/swagger-ui.js
@@ -33,7 +33,7 @@
.replace(/((?:src|href)=['"])/g, '$1?doc&path=')
// Some self-promotion
.replace(/<a id="logo".*?<\/a>/,
- `<a id="logo"
href="${app.info.homepage}">${app.info.name}</a>`)
+ `<a id="logo"
href="${app.info.homepage}">${app.info.name}</a>`)
.replace(/<title>[^<]*<\/title>/,
`<title>${app.info.name}</title>`)
// Replace the default url with ours, switch off validation &
// limit the size of documents to apply syntax highlighting to
diff --git a/package.json b/package.json
index 7e5e6df..4e4040c 100644
--- a/package.json
+++ b/package.json
@@ -46,16 +46,17 @@
"swagger-ui": "git+https://github.com/wikimedia/swagger-ui.git#master";
},
"devDependencies": {
+ "ajv": "^5.5.0",
"extend": "^3.0.1",
"istanbul": "^0.4.5",
"mocha": "^4.0.1",
"mocha-jshint": "^2.3.1",
"mocha-lcov-reporter": "^1.3.0",
"nsp": "^2.8.1",
- "mocha-eslint": "^3.0.1",
- "eslint": "^3.12.0",
- "eslint-config-node-services": "^2.0.2",
- "eslint-config-wikimedia": "^0.4.0",
+ "mocha-eslint": "^4.0.1",
+ "eslint": "^4.12.0",
+ "eslint-config-node-services": "^2.2.5",
+ "eslint-config-wikimedia": "^0.5.0",
"eslint-plugin-json": "^1.2.0",
"eslint-plugin-jsdoc": "^3.0.0"
},
diff --git a/test/mocha.opts b/test/mocha.opts
index 5a2be76..d8a47e6 100644
--- a/test/mocha.opts
+++ b/test/mocha.opts
@@ -1,2 +1,3 @@
--recursive
--no-timeouts
+--exit
--
To view, visit https://gerrit.wikimedia.org/r/399361
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifa503f878f04c2f1868c3b44c4dcab3c5ed7bf9d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/chromium-render
Gerrit-Branch: master
Gerrit-Owner: Mobrovac <[email protected]>
Gerrit-Reviewer: Bmansurov <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Mobrovac <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
