jenkins-bot has submitted this change and it was merged.
Change subject: Fix some variable shadowing
......................................................................
Fix some variable shadowing
* Identified by a newer version of jshint
Change-Id: I5ef86c74aabe08828bb8b0cf5337bb855b15409a
---
M bin/parserTests.js
M lib/api/routes.js
M lib/config/ParsoidConfig.js
3 files changed, 7 insertions(+), 8 deletions(-)
Approvals:
Arlolra: Looks good to me, approved
Subramanya Sastry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/bin/parserTests.js b/bin/parserTests.js
index 410565c..e29e05e 100755
--- a/bin/parserTests.js
+++ b/bin/parserTests.js
@@ -1707,14 +1707,14 @@
// "suppressError" option on the test if error is expected.)
this.loggedErrorCount = 0;
env.setLogger = (function(parserTests, superSetLogger) {
- return function(logger) {
- superSetLogger.call(this, logger);
+ return function(_logger) {
+ superSetLogger.call(this, _logger);
this.log = function(level) {
- if (logger !==
parserTests.suppressLogger &&
+ if (_logger !==
parserTests.suppressLogger &&
/^(fatal|error)\b/.test(level))
{
parserTests.loggedErrorCount++;
}
- return logger.log.apply(logger,
arguments);
+ return _logger.log.apply(_logger,
arguments);
};
};
})(this, env.setLogger);
diff --git a/lib/api/routes.js b/lib/api/routes.js
index b4ddfbd..13f2404 100644
--- a/lib/api/routes.js
+++ b/lib/api/routes.js
@@ -2,7 +2,7 @@
require('../../core-upgrade.js');
var childProcess = require('child_process');
-var path = require('path');
+var corepath = require('path');
var qs = require('querystring');
var pkg = require('../../package.json');
@@ -198,7 +198,7 @@
return Promise.promisify(
childProcess.execFile, ['stdout',
'stderr'], childProcess
)('git', ['rev-parse', 'HEAD'], {
- cwd: path.join(__dirname, '..'),
+ cwd: corepath.join(__dirname, '..'),
}).then(function(out) {
v.sha = out.stdout.slice(0, -1);
return v;
diff --git a/lib/config/ParsoidConfig.js b/lib/config/ParsoidConfig.js
index 6a7a564..67f1bcd 100644
--- a/lib/config/ParsoidConfig.js
+++ b/lib/config/ParsoidConfig.js
@@ -423,10 +423,9 @@
var insertInMaps = function(proxyURI, site) {
// Avoid overwriting those already set in localsettings setup.
if (!this.mwApiMap.has(site.dbname)) {
- var url = site.url;
var apiConf = {
prefix: site.dbname,
- uri: url + "/w/api.php",
+ uri: site.url + "/w/api.php",
proxy: {
uri: proxyURI,
// WMF production servers don't listen
on port 443.
--
To view, visit https://gerrit.wikimedia.org/r/281840
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5ef86c74aabe08828bb8b0cf5337bb855b15409a
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra <[email protected]>
Gerrit-Reviewer: Arlolra <[email protected]>
Gerrit-Reviewer: Cscott <[email protected]>
Gerrit-Reviewer: Subramanya Sastry <[email protected]>
Gerrit-Reviewer: Tim Starling <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
