Skip to content

Commit

Permalink
[eslint] fix no-unused-vars violations
Browse files Browse the repository at this point in the history
  • Loading branch information
spalger committed May 14, 2018
1 parent 8989135 commit f493527
Show file tree
Hide file tree
Showing 22 changed files with 93 additions and 117 deletions.
2 changes: 1 addition & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ rules:
no-undef: warn
no-underscore-dangle: off
no-unused-expressions: error
no-unused-vars: warn
no-unused-vars: error
no-use-before-define: off
object-shorthand: off
one-var: off
Expand Down
5 changes: 1 addition & 4 deletions test/integration/yaml_suite/run.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
module.exports = function (branch) {
var path = require('path');
var jsYaml = require('js-yaml');
var YamlFile = require('./yaml_file');
var root = require('find-root')(__dirname);
var rootReq = function (loc) { return require(path.join(root, loc)); };
var _ = require('lodash');
var utils = rootReq('src/lib/utils');
var gruntUtils = rootReq('grunt/utils');
var es = rootReq('src/elasticsearch');
var clientManager = require('./client_manager');

var port = parseInt(process.env.ES_PORT || 9200, 10);
Expand All @@ -33,7 +30,7 @@ module.exports = function (branch) {
return clientManager.get().clearEs();
});

var files = _.map(require('./yaml_tests_' + utils.snakeCase(branch) + '.json'), function (docs, filename) {
_.map(require('./yaml_tests_' + utils.snakeCase(branch) + '.json'), function (docs, filename) {
return new YamlFile(filename, docs);
});

Expand Down
16 changes: 8 additions & 8 deletions test/mocks/writable_stream.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,19 @@ if (Writable) {
MockWritableStream = module.exports = function (opts) {
Writable.call(this, opts);

this._write = function (chunk, encoding, cb) {};
this._write = function () {};
};
util.inherits(MockWritableStream, Writable);
} else {
// Node < 0.10 did not provide a usefull stream abstract
var Stream = require('stream').Stream;
module.exports = MockWritableStream = function (opts) {
module.exports = MockWritableStream = function () {
Stream.call(this);
this.writable = true;
};
util.inherits(MockWritableStream, Stream);

MockWritableStream.prototype.write = function (data) {
MockWritableStream.prototype.write = function () {
if (!this.writable) {
this.emit('error', new Error('stream not writable'));
return false;
Expand All @@ -41,15 +41,15 @@ if (Writable) {
}
};

MockWritableStream.prototype.end = function (data, encoding, cb) {
if (typeof(data) === 'function') {
cb = data;
} else if (typeof(encoding) === 'function') {
cb = encoding;
MockWritableStream.prototype.end = function (data, encoding) {
if (typeof data === 'function') {
// no callback support
} else if (typeof encoding === 'function') {
this.write(data);
} else if (arguments.length > 0) {
this.write(data, encoding);
}

this.writable = false;
};

Expand Down
7 changes: 0 additions & 7 deletions test/unit/browser_builds/angular.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,14 @@
var _ = require('lodash');
var expect = require('expect.js');
var Promise = require('bluebird');
var sinon = require('sinon');

describe('Angular esFactory', function () {
before(function () {
require('../../../src/elasticsearch.angular.js');
});

var uuid = (function () { var i = 0; return function () { return ++i; }; }());
var esFactory;
var $http;
var $rootScope;
var $httpBackend;

function bootstrap(env) {
beforeEach(function () {
Expand All @@ -37,10 +33,8 @@ describe('Angular esFactory', function () {
});

beforeEach(angular.mock.inject(function ($injector) {
$http = $injector.get('$http');
esFactory = $injector.get('esFactory');
$rootScope = $injector.get('$rootScope');
$httpBackend = $injector.get('$httpBackend');
}));
}

Expand Down Expand Up @@ -70,7 +64,6 @@ describe('Angular esFactory', function () {

it('returns an error created by calling a method incorrectly', function () {
var client = esFactory({ hosts: null });
var err;

var prom = client.get().then(function () {
throw new Error('expected request to fail');
Expand Down
1 change: 0 additions & 1 deletion test/unit/browser_builds/generic.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
var expect = require('expect.js');
var Transport = require('../../../src/lib/transport');

describe('elasticsearch namespace', function () {
var es = window.elasticsearch;
Expand Down
1 change: 0 additions & 1 deletion test/unit/browser_builds/jquery.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/* global $ */
var expect = require('expect.js');
var Transport = require('../../../src/lib/transport');

describe('jQuery.es namespace', function () {
it('is defined on the global jQuery', function () {
Expand Down
2 changes: 1 addition & 1 deletion test/unit/buffer_flush_tests.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ module.exports = function (makeLogger) {
once.call(process, event, handler);
});

var logger = makeLogger();
makeLogger();

expect(function () {
// call the event handler
Expand Down
2 changes: 1 addition & 1 deletion test/unit/coverage.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
var blanket = require('blanket')({
require('blanket')({
pattern: require('path').join(__dirname, '../../src')
});

Expand Down
24 changes: 11 additions & 13 deletions test/unit/generic_logger_tests.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
var expect = require('expect.js');
var Log = require('../../src/lib/log');
var LoggerAbstract = require('../../src/lib/logger');
var TracerLogger = require('../../src/lib/loggers/tracer');
var now = new Date('2013-03-01T00:00:00Z');
var sinon = require('sinon');

Expand All @@ -24,7 +22,7 @@ module.exports = function (makeLogger) {
});

it('listens for the loggers\' "closing" event', function () {
var logger = makeLogger(parent);
makeLogger(parent);
expect(parent.listenerCount('closing')).to.eql(1);
});
});
Expand All @@ -38,7 +36,7 @@ module.exports = function (makeLogger) {
});

it('listens to just error when log is explicitly error', function () {
var logger = makeLogger(parent, 'error');
makeLogger(parent, 'error');
expect(parent.listenerCount('error')).to.eql(1);
expect(parent.listenerCount('warning')).to.eql(0);
expect(parent.listenerCount('info')).to.eql(0);
Expand All @@ -47,7 +45,7 @@ module.exports = function (makeLogger) {
});

it('listens for all the events when level is "trace"', function () {
var logger = makeLogger(parent, 'trace');
makeLogger(parent, 'trace');
expect(parent.listenerCount('error')).to.eql(1);
expect(parent.listenerCount('warning')).to.eql(1);
expect(parent.listenerCount('info')).to.eql(1);
Expand All @@ -56,7 +54,7 @@ module.exports = function (makeLogger) {
});

it('listens for specific events when level is an array', function () {
var logger = makeLogger(parent, ['error', 'trace']);
makeLogger(parent, ['error', 'trace']);
expect(parent.listenerCount('error')).to.eql(1);
expect(parent.listenerCount('warning')).to.eql(0);
expect(parent.listenerCount('info')).to.eql(0);
Expand Down Expand Up @@ -87,7 +85,7 @@ module.exports = function (makeLogger) {
});

it('emits events because something is listening', function () {
var logger = makeLogger(parent, 'trace');
makeLogger(parent, 'trace');
stub(parent, 'emit');

parent.error(new Error('error message'));
Expand Down Expand Up @@ -142,7 +140,7 @@ module.exports = function (makeLogger) {
describe('#onError', function () {
it('uses the Error name when it is not just "Error"', function () {
var logger = makeLogger();
stub(logger, 'write', function (label, msg) {
stub(logger, 'write', function (label) {
expect(label).to.eql('TypeError');
});

Expand All @@ -152,7 +150,7 @@ module.exports = function (makeLogger) {

it('uses "ERROR" when the error name is "Error"', function () {
var logger = makeLogger();
stub(logger, 'write', function (label, msg) {
stub(logger, 'write', function (label) {
expect(label).to.eql('ERROR');
});

Expand All @@ -164,7 +162,7 @@ module.exports = function (makeLogger) {
describe('#onWarning', function () {
it('uses the "WARNING" label', function () {
var logger = makeLogger();
stub(logger, 'write', function (label, msg) {
stub(logger, 'write', function (label) {
expect(label).to.eql('WARNING');
});
logger.onWarning('message');
Expand All @@ -185,7 +183,7 @@ module.exports = function (makeLogger) {
describe('#onInfo', function () {
it('uses the "INFO" label', function () {
var logger = makeLogger();
stub(logger, 'write', function (label, msg) {
stub(logger, 'write', function (label) {
expect(label).to.eql('INFO');
});
logger.onInfo('message');
Expand All @@ -206,7 +204,7 @@ module.exports = function (makeLogger) {
describe('#onDebug', function () {
it('uses the "DEBUG" label', function () {
var logger = makeLogger();
stub(logger, 'write', function (label, msg) {
stub(logger, 'write', function (label) {
expect(label).to.eql('DEBUG');
});
logger.onDebug('message');
Expand All @@ -227,7 +225,7 @@ module.exports = function (makeLogger) {
describe('#onTrace', function () {
it('uses the "TRACE" label', function () {
var logger = makeLogger();
stub(logger, 'write', function (label, msg) {
stub(logger, 'write', function (label) {
expect(label).to.eql('TRACE');
});
logger.onTrace(Log.normalizeTraceArgs('GET', 'http://place/thing?me=true', '{}', '{"ok": true}', 200));
Expand Down
2 changes: 0 additions & 2 deletions test/unit/specs/abstract_logger.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
describe('Logger Abstract', function () {
var expect = require('expect.js');
var sinon = require('sinon');
var Log = require('../../../src/lib/log');
var LoggerAbstract = require('../../../src/lib/logger');

var parentLog;
var stub = require('../../utils/auto_release_stub').make();

function makeLogger(parent, levels) {
return new LoggerAbstract(parent || parentLog, {
Expand Down
Loading

0 comments on commit f493527

Please sign in to comment.