jenkins-bot has submitted this change and it was merged.
Change subject: Hygiene: forbid unused variables and fix offenders
......................................................................
Hygiene: forbid unused variables and fix offenders
Change-Id: I4e55de89de579369b01876e9db9a4365df24d606
---
M .jscsrc
M lib/feed/featured-image.js
M lib/feed/featured.js
M lib/feed/news.js
M lib/mwapi.js
M lib/parseDefinition.js
M lib/parseProperty.js
M lib/parseSection.js
M lib/parsoid-access.js
M lib/transforms.js
M routes/announcements.js
M routes/definition.js
M routes/media.js
M routes/mobile-sections.js
M routes/mobile-summary.js
M routes/mobile-text.js
M test/features/mobile-sections-remaining/pagecontent.js
M test/features/most-read/most-read.js
M test/features/news/news.js
M test/features/random/summary.js
M test/lib/api-util/api-util-test.js
M test/lib/dateUtil/date-util-test.js
M test/lib/mobile-util/mobile-util-test.js
M test/utils/server.js
24 files changed, 4 insertions(+), 35 deletions(-)
Approvals:
BearND: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.jscsrc b/.jscsrc
index 7b34c72..27a0ed2 100644
--- a/.jscsrc
+++ b/.jscsrc
@@ -26,6 +26,7 @@
"requireLineFeedAtFileEnd": null,
"requireSpacesInsideObjectBrackets": null,
"requireSpaceBetweenArguments": null,
+ "disallowUnusedVariables": true,
"disallowVar": true,
"requireVarDeclFirst": null,
"jsDoc": null,
diff --git a/lib/feed/featured-image.js b/lib/feed/featured-image.js
index 8439fed..b0ec58c 100644
--- a/lib/feed/featured-image.js
+++ b/lib/feed/featured-image.js
@@ -5,7 +5,6 @@
'use strict';
const BBPromise = require('bluebird');
-const preq = require('preq');
const api = require('../api-util');
const dateUtil = require('../dateUtil');
const domino = require('domino');
diff --git a/lib/feed/featured.js b/lib/feed/featured.js
index 17967e3..5a1a28c 100644
--- a/lib/feed/featured.js
+++ b/lib/feed/featured.js
@@ -4,7 +4,6 @@
'use strict';
-const preq = require('preq');
const mUtil = require('../mobile-util');
const api = require('../api-util');
const mwapi = require('../mwapi');
diff --git a/lib/feed/news.js b/lib/feed/news.js
index 7c4225e..40560aa 100644
--- a/lib/feed/news.js
+++ b/lib/feed/news.js
@@ -2,9 +2,8 @@
const BBPromise = require('bluebird');
const domino = require('domino');
-const api = require('../api-util');
+
const mUtil = require('../mobile-util');
-const mwapi = require('../mwapi');
const parsoid = require('../parsoid-access');
const HTTPError = require('../util').HTTPError;
const NEWS_TEMPLATES = require('../../etc/feed/news-sites');
diff --git a/lib/mwapi.js b/lib/mwapi.js
index e60062b..653b3e3 100644
--- a/lib/mwapi.js
+++ b/lib/mwapi.js
@@ -4,7 +4,6 @@
'use strict';
-const preq = require('preq');
const sUtil = require('./util');
const api = require('./api-util');
const HTTPError = sUtil.HTTPError;
diff --git a/lib/parseDefinition.js b/lib/parseDefinition.js
index 883d5e4..6f74164 100644
--- a/lib/parseDefinition.js
+++ b/lib/parseDefinition.js
@@ -7,11 +7,8 @@
'use strict';
-const domino = require('domino');
const sUtil = require('./util');
-const mUtil = require('./mobile-util');
const transforms = require('./transforms');
-const parseSection = require('./parseSection');
const languageList = require('../static/languages_list.json');
/* This list has expanded beyond parts of speech to something more like
"whatever
diff --git a/lib/parseProperty.js b/lib/parseProperty.js
index 48beda0..f045d1e 100644
--- a/lib/parseProperty.js
+++ b/lib/parseProperty.js
@@ -6,7 +6,6 @@
'use strict';
const mUtil = require('../lib/mobile-util');
-const util = require('util');
const escape = require('escape-string-regexp');
function parseInfobox(doc) {
diff --git a/lib/parseSection.js b/lib/parseSection.js
index ee6dfb8..f874eb6 100644
--- a/lib/parseSection.js
+++ b/lib/parseSection.js
@@ -1,6 +1,5 @@
'use strict';
-const transforms = require('./transforms');
const a = require('./anchorencode');
function parse(sectionDiv, startingNode) {
diff --git a/lib/parsoid-access.js b/lib/parsoid-access.js
index a5de178..972c216 100644
--- a/lib/parsoid-access.js
+++ b/lib/parsoid-access.js
@@ -4,12 +4,10 @@
'use strict';
-const preq = require('preq');
const domino = require('domino');
const a = require('./anchorencode');
const sUtil = require('./util');
const api = require('./api-util');
-const mUtil = require('./mobile-util');
const parseSection = require('./parseSection');
const parseProperty = require('./parseProperty');
const parseDefinition = require('./parseDefinition');
@@ -23,7 +21,6 @@
* @return {promise} a Promise, which if fulfilled, will return the Parsoid
content of the given page.
*/
function getParsoidHtml(app, req) {
- const revision = req.params.revision;
const domain = req.params.domain.replace(/^(\w+\.)m\./, '$1');
const path = 'page/html/' + encodeURIComponent(req.params.title);
const restReq = {
diff --git a/lib/transforms.js b/lib/transforms.js
index 4ac3671..43342b1 100644
--- a/lib/transforms.js
+++ b/lib/transforms.js
@@ -6,7 +6,6 @@
'use strict';
const domino = require('domino');
-const util = require('util');
const anchorPopUpMediaTransforms =
require('./transformations/anchorPopUpMediaTransforms');
const hideRedLinks = require('./transformations/hideRedLinks');
const hideIPA = require('./transformations/hideIPA');
diff --git a/routes/announcements.js b/routes/announcements.js
index cc03fb0..ac7e798 100644
--- a/routes/announcements.js
+++ b/routes/announcements.js
@@ -11,7 +11,7 @@
/**
* The main application object reported when this module is require()d
*/
-let app;
+let app; // jscs:ignore disallowUnusedVariables
function getEnwikiAnnouncements() {
return {
diff --git a/routes/definition.js b/routes/definition.js
index ecd5e17..79ccc14 100644
--- a/routes/definition.js
+++ b/routes/definition.js
@@ -4,8 +4,6 @@
'use strict';
-const BBPromise = require('bluebird');
-const domino = require('domino');
const mUtil = require('../lib/mobile-util');
const sUtil = require('../lib/util');
const parsoid = require('../lib/parsoid-access');
diff --git a/routes/media.js b/routes/media.js
index 1e6fe36..17737b1 100644
--- a/routes/media.js
+++ b/routes/media.js
@@ -3,9 +3,7 @@
const BBPromise = require('bluebird');
const mUtil = require('../lib/mobile-util');
const parsoid = require('../lib/parsoid-access');
-const preq = require('preq');
const sUtil = require('../lib/util');
-const transforms = require('../lib/transforms');
const gallery = require('../lib/gallery');
/**
diff --git a/routes/mobile-sections.js b/routes/mobile-sections.js
index 1a8deee..b9a65b5 100644
--- a/routes/mobile-sections.js
+++ b/routes/mobile-sections.js
@@ -12,7 +12,6 @@
'use strict';
const BBPromise = require('bluebird');
-const preq = require('preq');
const domino = require('domino');
const mwapi = require('../lib/mwapi');
const mUtil = require('../lib/mobile-util');
diff --git a/routes/mobile-summary.js b/routes/mobile-summary.js
index 0b0185c..73753c3 100644
--- a/routes/mobile-summary.js
+++ b/routes/mobile-summary.js
@@ -1,7 +1,6 @@
'use strict';
const BBPromise = require('bluebird');
-const preq = require('preq');
const domino = require('domino');
const extractLib = require('../lib/extract');
const mwapi = require('../lib/mwapi');
diff --git a/routes/mobile-text.js b/routes/mobile-text.js
index f590cac..e38494b 100644
--- a/routes/mobile-text.js
+++ b/routes/mobile-text.js
@@ -12,15 +12,11 @@
'use strict';
-//var BBPromise = require('bluebird');
-const preq = require('preq');
const domino = require('domino');
const sUtil = require('../lib/util');
const mUtil = require('../lib/mobile-util');
const mwapi = require('../lib/mwapi');
-// shortcut
-const HTTPError = sUtil.HTTPError;
/**
diff --git a/test/features/mobile-sections-remaining/pagecontent.js
b/test/features/mobile-sections-remaining/pagecontent.js
index 62d032d..90eecda 100644
--- a/test/features/mobile-sections-remaining/pagecontent.js
+++ b/test/features/mobile-sections-remaining/pagecontent.js
@@ -1,7 +1,5 @@
'use strict';
-const assert = require('../../utils/assert.js');
-const preq = require('preq');
const server = require('../../utils/server.js');
const headers = require('../../utils/headers.js');
diff --git a/test/features/most-read/most-read.js
b/test/features/most-read/most-read.js
index e9bb185..87951ab 100644
--- a/test/features/most-read/most-read.js
+++ b/test/features/most-read/most-read.js
@@ -2,7 +2,6 @@
const preq = require('preq');
const assert = require('../../utils/assert');
-const mUtil = require('../../../lib/mobile-util');
const server = require('../../utils/server');
const headers = require('../../utils/headers');
const testUtil = require('../../utils/testUtil');
diff --git a/test/features/news/news.js b/test/features/news/news.js
index 9713309..a8cc1bd 100644
--- a/test/features/news/news.js
+++ b/test/features/news/news.js
@@ -8,7 +8,6 @@
const assert = require('../../utils/assert');
const server = require('../../utils/server');
const headers = require('../../utils/headers');
-const constants = require('./constants');
const NEWS_TEMPLATES = require('../../../etc/feed/news-sites');
const mock_restbase_tpl = new Template({
diff --git a/test/features/random/summary.js b/test/features/random/summary.js
index 286333f..f5595b6 100644
--- a/test/features/random/summary.js
+++ b/test/features/random/summary.js
@@ -18,7 +18,6 @@
it('Random page summary should have expected properties', function() {
return preq.get({ uri: server.config.uri +
'de.wikipedia.org/v1/page/random/summary' })
.then(function(res) {
- const lead = res.body.lead;
assert.deepEqual(res.status, 200);
assert.ok(res.body.title.length > 0, 'title should not be
empty');
// It most likely has also a description, extract, and
thumbnail, just not guaranteed
diff --git a/test/lib/api-util/api-util-test.js
b/test/lib/api-util/api-util-test.js
index 96fcb8f..ddc774c 100644
--- a/test/lib/api-util/api-util-test.js
+++ b/test/lib/api-util/api-util-test.js
@@ -3,7 +3,6 @@
const preq = require('preq');
const assert = require('../../utils/assert');
const mwapi = require('../../../lib/mwapi');
-const HTTPError = require('../../../lib/util').HTTPError;
const logger = require('bunyan').createLogger({
name: 'test-logger',
@@ -35,4 +34,4 @@
assert.throws(function() { mwapi.checkForQueryPagesInResponse({
logger: logger }, response); }, /api_error/);
});
});
-});
\ No newline at end of file
+});
diff --git a/test/lib/dateUtil/date-util-test.js
b/test/lib/dateUtil/date-util-test.js
index 7a7289f..c24e7a4 100644
--- a/test/lib/dateUtil/date-util-test.js
+++ b/test/lib/dateUtil/date-util-test.js
@@ -2,7 +2,6 @@
const assert = require('../../utils/assert.js');
const dateUtil = require('../../../lib/dateUtil');
-const HTTPError = require('../../../lib/util').HTTPError;
describe('lib:dateUtil', function() {
this.timeout(20000);
diff --git a/test/lib/mobile-util/mobile-util-test.js
b/test/lib/mobile-util/mobile-util-test.js
index 865f6ae..2272c96 100644
--- a/test/lib/mobile-util/mobile-util-test.js
+++ b/test/lib/mobile-util/mobile-util-test.js
@@ -2,7 +2,6 @@
const assert = require('../../utils/assert');
const mUtil = require('../../../lib/mobile-util');
-const preq = require('preq');
const obj1 = { hello: true, world: true };
const obj2 = { goodbye: true, sea: true, again: false };
diff --git a/test/utils/server.js b/test/utils/server.js
index 661e715..fde0c33 100644
--- a/test/utils/server.js
+++ b/test/utils/server.js
@@ -9,7 +9,6 @@
process.env.VCR_MODE = process.env.VCR_MODE || 'cache';
}
-const sepia = require('sepia');
const BBPromise = require('bluebird');
const ServiceRunner = require('service-runner');
const logStream = require('./logStream');
--
To view, visit https://gerrit.wikimedia.org/r/322048
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4e55de89de579369b01876e9db9a4365df24d606
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/services/mobileapps
Gerrit-Branch: master
Gerrit-Owner: Niedzielski <sniedziel...@wikimedia.org>
Gerrit-Reviewer: BearND <bsitzm...@wikimedia.org>
Gerrit-Reviewer: Dbrant <dbr...@wikimedia.org>
Gerrit-Reviewer: Fjalapeno <cfl...@wikimedia.org>
Gerrit-Reviewer: GWicke <gwi...@wikimedia.org>
Gerrit-Reviewer: Jdlrobson <jrob...@wikimedia.org>
Gerrit-Reviewer: Jhernandez <jhernan...@wikimedia.org>
Gerrit-Reviewer: Mholloway <mhollo...@wikimedia.org>
Gerrit-Reviewer: Mhurd <mh...@wikimedia.org>
Gerrit-Reviewer: Mobrovac <mobro...@wikimedia.org>
Gerrit-Reviewer: Niedzielski <sniedziel...@wikimedia.org>
Gerrit-Reviewer: Ppchelko <ppche...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
