Skip to content

Commit 79927c5

Browse files
SalakarSalakar
committed
tests: remove unused parser client option from all tests & helpers
1 parent a513c8b commit 79927c5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+149
-172
lines changed

‎test/auth.spec.js

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ describe('client authentication', function () {
1919

2020
helper.allTests({
2121
allConnections: true
22-
}, function (parser, ip, args) {
22+
}, function (ip, args) {
2323

24-
describe('using ' + parser + ' and ' + ip, function () {
24+
describe('using ' + ip, function () {
2525
var auth = 'porkchopsandwiches';
2626
var client = null;
2727

@@ -133,7 +133,7 @@ describe('client authentication', function () {
133133
it('allows auth to be provided as config option for client', function (done) {
134134
if (helper.redisProcess().spawnFailed()) this.skip();
135135

136-
var args = config.configureClient(parser, ip, {
136+
var args = config.configureClient(ip, {
137137
auth_pass: auth
138138
});
139139
client = redis.createClient.apply(null, args);
@@ -143,7 +143,7 @@ describe('client authentication', function () {
143143
it('allows auth and no_ready_check to be provided as config option for client', function (done) {
144144
if (helper.redisProcess().spawnFailed()) this.skip();
145145

146-
var args = config.configureClient(parser, ip, {
146+
var args = config.configureClient(ip, {
147147
password: auth,
148148
no_ready_check: true
149149
});
@@ -154,7 +154,7 @@ describe('client authentication', function () {
154154
it('allows auth to be provided post-hoc with auth method', function (done) {
155155
if (helper.redisProcess().spawnFailed()) this.skip();
156156

157-
var args = config.configureClient(parser, ip);
157+
var args = config.configureClient(ip);
158158
client = redis.createClient.apply(null, args);
159159
client.auth(auth);
160160
client.on('ready', done);
@@ -217,7 +217,7 @@ describe('client authentication', function () {
217217
it('allows auth to be provided post-hoc with auth method again', function (done) {
218218
if (helper.redisProcess().spawnFailed()) this.skip();
219219

220-
var args = config.configureClient(parser, ip, {
220+
var args = config.configureClient(ip, {
221221
auth_pass: auth
222222
});
223223
client = redis.createClient.apply(null, args);
@@ -229,7 +229,7 @@ describe('client authentication', function () {
229229
it('does not allow any commands to be processed if not authenticated using no_ready_check true', function (done) {
230230
if (helper.redisProcess().spawnFailed()) this.skip();
231231

232-
var args = config.configureClient(parser, ip, {
232+
var args = config.configureClient(ip, {
233233
no_ready_check: true
234234
});
235235
client = redis.createClient.apply(null, args);
@@ -258,7 +258,6 @@ describe('client authentication', function () {
258258
if (helper.redisProcess().spawnFailed()) this.skip();
259259
client = redis.createClient({
260260
password: 'wrong_password',
261-
parser: parser
262261
});
263262
client.once('error', function (err) {
264263
assert.strictEqual(err.message, 'ERR invalid password');
@@ -269,7 +268,7 @@ describe('client authentication', function () {
269268
it('pubsub working with auth', function (done) {
270269
if (helper.redisProcess().spawnFailed()) this.skip();
271270

272-
var args = config.configureClient(parser, ip, {
271+
var args = config.configureClient(ip, {
273272
password: auth
274273
});
275274
client = redis.createClient.apply(null, args);
@@ -299,7 +298,7 @@ describe('client authentication', function () {
299298
// returning the manipulated [error, result] from the callback.
300299
// There should be a better solution though
301300

302-
var args = config.configureClient(parser, 'localhost', {
301+
var args = config.configureClient('localhost', {
303302
noReadyCheck: true
304303
});
305304
client = redis.createClient.apply(null, args);

‎test/batch.spec.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ var redis = config.redis;
77

88
describe("The 'batch' method", function () {
99

10-
helper.allTests(function (parser, ip, args) {
10+
helper.allTests(function (ip, args) {
1111

12-
describe('using ' + parser + ' and ' + ip, function () {
12+
describe('using ' + ip, function () {
1313

1414
describe('when not connected', function () {
1515
var client;

‎test/commands/blpop.spec.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ var intercept = require('intercept-stdout');
88

99
describe("The 'blpop' method", function () {
1010

11-
helper.allTests(function (parser, ip, args) {
11+
helper.allTests(function (ip, args) {
1212

13-
describe('using ' + parser + ' and ' + ip, function () {
13+
describe('using ' + ip, function () {
1414
var client;
1515
var bclient;
1616

‎test/commands/client.spec.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ var redis = config.redis;
77

88
describe("The 'client' method", function () {
99

10-
helper.allTests(function (parser, ip, args) {
10+
helper.allTests(function (ip, args) {
1111
var pattern = /addr=/;
1212

13-
describe('using ' + parser + ' and ' + ip, function () {
13+
describe('using ' + ip, function () {
1414
var client;
1515

1616
beforeEach(function (done) {

‎test/commands/dbsize.spec.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ var uuid = require('uuid');
88

99
describe("The 'dbsize' method", function () {
1010

11-
helper.allTests(function (parser, ip, args) {
11+
helper.allTests(function (ip, args) {
1212

13-
describe('using ' + parser + ' and ' + ip, function () {
13+
describe('using ' + ip, function () {
1414
var key, value;
1515

1616
beforeEach(function () {

‎test/commands/del.spec.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ var redis = config.redis;
66

77
describe("The 'del' method", function () {
88

9-
helper.allTests(function (parser, ip, args) {
9+
helper.allTests(function (ip, args) {
1010

11-
describe('using ' + parser + ' and ' + ip, function () {
11+
describe('using ' + ip, function () {
1212
var client;
1313

1414
beforeEach(function (done) {

‎test/commands/eval.spec.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ var redis = config.redis;
88

99
describe("The 'eval' method", function () {
1010

11-
helper.allTests(function (parser, ip, args) {
11+
helper.allTests(function (ip, args) {
1212

13-
describe('using ' + parser + ' and ' + ip, function () {
13+
describe('using ' + ip, function () {
1414
var client;
1515
var source = "return redis.call('set', 'sha', 'test')";
1616

‎test/commands/exists.spec.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ var redis = config.redis;
66

77
describe("The 'exists' method", function () {
88

9-
helper.allTests(function (parser, ip, args) {
9+
helper.allTests(function (ip, args) {
1010

11-
describe('using ' + parser + ' and ' + ip, function () {
11+
describe('using ' + ip, function () {
1212
var client;
1313

1414
beforeEach(function (done) {

‎test/commands/expire.spec.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ var redis = config.redis;
66

77
describe("The 'expire' method", function () {
88

9-
helper.allTests(function (parser, ip, args) {
9+
helper.allTests(function (ip, args) {
1010

11-
describe('using ' + parser + ' and ' + ip, function () {
11+
describe('using ' + ip, function () {
1212
var client;
1313

1414
beforeEach(function (done) {

‎test/commands/flushdb.spec.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ var uuid = require('uuid');
88

99
describe("The 'flushdb' method", function () {
1010

11-
helper.allTests(function (parser, ip, args) {
11+
helper.allTests(function (ip, args) {
1212

13-
describe('using ' + parser + ' and ' + ip, function () {
13+
describe('using ' + ip, function () {
1414
var key, key2;
1515

1616
beforeEach(function () {

‎test/commands/geoadd.spec.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ var redis = config.redis;
66

77
describe("The 'geoadd' method", function () {
88

9-
helper.allTests(function (parser, ip, args) {
9+
helper.allTests(function (ip, args) {
1010

11-
describe('using ' + parser + ' and ' + ip, function () {
11+
describe('using ' + ip, function () {
1212
var client;
1313

1414
beforeEach(function (done) {

‎test/commands/get.spec.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ var uuid = require('uuid');
88

99
describe("The 'get' method", function () {
1010

11-
helper.allTests(function (parser, ip, args) {
11+
helper.allTests(function (ip, args) {
1212

13-
describe('using ' + parser + ' and ' + ip, function () {
13+
describe('using ' + ip, function () {
1414
var key, value;
1515

1616
beforeEach(function () {

‎test/commands/getset.spec.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ var uuid = require('uuid');
88

99
describe("The 'getset' method", function () {
1010

11-
helper.allTests(function (parser, ip, args) {
11+
helper.allTests(function (ip, args) {
1212

13-
describe('using ' + parser + ' and ' + ip, function () {
13+
describe('using ' + ip, function () {
1414
var key, value, value2;
1515

1616
beforeEach(function () {

‎test/commands/hgetall.spec.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ var redis = config.redis;
77

88
describe("The 'hgetall' method", function () {
99

10-
helper.allTests(function (parser, ip, args) {
10+
helper.allTests(function (ip, args) {
1111

12-
describe('using ' + parser + ' and ' + ip, function () {
12+
describe('using ' + ip, function () {
1313
var client;
1414

1515
describe('regular client', function () {
@@ -51,7 +51,7 @@ describe("The 'hgetall' method", function () {
5151

5252
describe('binary client', function () {
5353
var client;
54-
var args = config.configureClient(parser, ip, {
54+
var args = config.configureClient(ip, {
5555
return_buffers: true
5656
});
5757

‎test/commands/hincrby.spec.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ var redis = config.redis;
66

77
describe("The 'hincrby' method", function () {
88

9-
helper.allTests(function (parser, ip, args) {
9+
helper.allTests(function (ip, args) {
1010

11-
describe('using ' + parser + ' and ' + ip, function () {
11+
describe('using ' + ip, function () {
1212
var client;
1313
var hash = 'test hash';
1414

‎test/commands/hlen.spec.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ var redis = config.redis;
66

77
describe("The 'hlen' method", function () {
88

9-
helper.allTests(function (parser, ip, args) {
9+
helper.allTests(function (ip, args) {
1010

11-
describe('using ' + parser + ' and ' + ip, function () {
11+
describe('using ' + ip, function () {
1212
var client;
1313

1414
beforeEach(function (done) {

‎test/commands/hmget.spec.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ var redis = config.redis;
77

88
describe("The 'hmget' method", function () {
99

10-
helper.allTests(function (parser, ip, args) {
10+
helper.allTests(function (ip, args) {
1111

12-
describe('using ' + parser + ' and ' + ip, function () {
12+
describe('using ' + ip, function () {
1313
var client;
1414
var hash = 'test hash';
1515

‎test/commands/hmset.spec.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ var redis = config.redis;
77

88
describe("The 'hmset' method", function () {
99

10-
helper.allTests(function (parser, ip, args) {
10+
helper.allTests(function (ip, args) {
1111

12-
describe('using ' + parser + ' and ' + ip, function () {
12+
describe('using ' + ip, function () {
1313
var client;
1414
var hash = 'test hash';
1515

‎test/commands/hset.spec.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ var redis = config.redis;
77

88
describe("The 'hset' method", function () {
99

10-
helper.allTests(function (parser, ip, args) {
10+
helper.allTests(function (ip, args) {
1111

12-
describe('using ' + parser + ' and ' + ip, function () {
12+
describe('using ' + ip, function () {
1313
var client;
1414
var hash = 'test hash';
1515

‎test/commands/incr.spec.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ var redis = config.redis;
77

88
describe("The 'incr' method", function () {
99

10-
helper.allTests(function (parser, ip, args) {
10+
helper.allTests(function (ip, args) {
1111

12-
describe('using ' + parser + ' and ' + ip, function () {
12+
describe('using ' + ip, function () {
1313

1414
describe('when connected and a value in Redis', function () {
1515

‎test/commands/info.spec.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ var redis = config.redis;
77

88
describe("The 'info' method", function () {
99

10-
helper.allTests(function (parser, ip, args) {
10+
helper.allTests(function (ip, args) {
1111

12-
describe('using ' + parser + ' and ' + ip, function () {
12+
describe('using ' + ip, function () {
1313
var client;
1414

1515
beforeEach(function (done) {

‎test/commands/keys.spec.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ var redis = config.redis;
88

99
describe("The 'keys' method", function () {
1010

11-
helper.allTests(function (parser, ip, args) {
11+
helper.allTests(function (ip, args) {
1212

13-
describe('using ' + parser + ' and ' + ip, function () {
13+
describe('using ' + ip, function () {
1414
var client;
1515

1616
beforeEach(function (done) {

‎test/commands/mget.spec.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ var redis = config.redis;
77

88
describe("The 'mget' method", function () {
99

10-
helper.allTests(function (parser, ip, args) {
10+
helper.allTests(function (ip, args) {
1111

12-
describe('using ' + parser + ' and ' + ip, function () {
12+
describe('using ' + ip, function () {
1313
var client;
1414

1515
beforeEach(function (done) {

‎test/commands/monitor.spec.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ var redis = config.redis;
88

99
describe("The 'monitor' method", function () {
1010

11-
helper.allTests(function (parser, ip, args) {
11+
helper.allTests(function (ip, args) {
1212

1313
var client;
1414

@@ -62,7 +62,7 @@ describe("The 'monitor' method", function () {
6262
end(err);
6363
});
6464
monitorClient.subscribe('foo', 'baz', function (err, res) {
65-
// The return value might change in v.3
65+
// The return value might change in v.4
6666
// assert.strictEqual(res, 'baz');
6767
// TODO: Fix the return value of subscribe calls
6868
end(err);

‎test/commands/mset.spec.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ var uuid = require('uuid');
88

99
describe("The 'mset' method", function () {
1010

11-
helper.allTests(function (parser, ip, args) {
11+
helper.allTests(function (ip, args) {
1212

13-
describe('using ' + parser + ' and ' + ip, function () {
13+
describe('using ' + ip, function () {
1414
var key, value, key2, value2;
1515

1616
beforeEach(function () {

‎test/commands/msetnx.spec.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ var redis = config.redis;
66

77
describe("The 'msetnx' method", function () {
88

9-
helper.allTests(function (parser, ip, args) {
9+
helper.allTests(function (ip, args) {
1010

11-
describe('using ' + parser + ' and ' + ip, function () {
11+
describe('using ' + ip, function () {
1212
var client;
1313

1414
beforeEach(function (done) {

0 commit comments

Comments
 (0)