diff --git a/test/auth.spec.js b/test/auth.spec.js index 67e6d0924a1..d88ac6304e3 100644 --- a/test/auth.spec.js +++ b/test/auth.spec.js @@ -19,9 +19,9 @@ describe('client authentication', function () { helper.allTests({ allConnections: true - }, function (parser, ip, args) { + }, function (ip, args) { - describe('using ' + parser + ' and ' + ip, function () { + describe('using ' + ip, function () { var auth = 'porkchopsandwiches'; var client = null; @@ -133,7 +133,7 @@ describe('client authentication', function () { it('allows auth to be provided as config option for client', function (done) { if (helper.redisProcess().spawnFailed()) this.skip(); - var args = config.configureClient(parser, ip, { + var args = config.configureClient(ip, { auth_pass: auth }); client = redis.createClient.apply(null, args); @@ -143,7 +143,7 @@ describe('client authentication', function () { it('allows auth and no_ready_check to be provided as config option for client', function (done) { if (helper.redisProcess().spawnFailed()) this.skip(); - var args = config.configureClient(parser, ip, { + var args = config.configureClient(ip, { password: auth, no_ready_check: true }); @@ -154,7 +154,7 @@ describe('client authentication', function () { it('allows auth to be provided post-hoc with auth method', function (done) { if (helper.redisProcess().spawnFailed()) this.skip(); - var args = config.configureClient(parser, ip); + var args = config.configureClient(ip); client = redis.createClient.apply(null, args); client.auth(auth); client.on('ready', done); @@ -217,7 +217,7 @@ describe('client authentication', function () { it('allows auth to be provided post-hoc with auth method again', function (done) { if (helper.redisProcess().spawnFailed()) this.skip(); - var args = config.configureClient(parser, ip, { + var args = config.configureClient(ip, { auth_pass: auth }); client = redis.createClient.apply(null, args); @@ -229,7 +229,7 @@ describe('client authentication', function () { it('does not allow any commands to be processed if not authenticated using no_ready_check true', function (done) { if (helper.redisProcess().spawnFailed()) this.skip(); - var args = config.configureClient(parser, ip, { + var args = config.configureClient(ip, { no_ready_check: true }); client = redis.createClient.apply(null, args); @@ -258,7 +258,6 @@ describe('client authentication', function () { if (helper.redisProcess().spawnFailed()) this.skip(); client = redis.createClient({ password: 'wrong_password', - parser: parser }); client.once('error', function (err) { assert.strictEqual(err.message, 'ERR invalid password'); @@ -269,7 +268,7 @@ describe('client authentication', function () { it('pubsub working with auth', function (done) { if (helper.redisProcess().spawnFailed()) this.skip(); - var args = config.configureClient(parser, ip, { + var args = config.configureClient(ip, { password: auth }); client = redis.createClient.apply(null, args); @@ -299,7 +298,7 @@ describe('client authentication', function () { // returning the manipulated [error, result] from the callback. // There should be a better solution though - var args = config.configureClient(parser, 'localhost', { + var args = config.configureClient('localhost', { noReadyCheck: true }); client = redis.createClient.apply(null, args); diff --git a/test/batch.spec.js b/test/batch.spec.js index df038e77e6a..05cee80681a 100644 --- a/test/batch.spec.js +++ b/test/batch.spec.js @@ -7,9 +7,9 @@ var redis = config.redis; describe("The 'batch' method", function () { - helper.allTests(function (parser, ip, args) { + helper.allTests(function (ip, args) { - describe('using ' + parser + ' and ' + ip, function () { + describe('using ' + ip, function () { describe('when not connected', function () { var client; diff --git a/test/commands/blpop.spec.js b/test/commands/blpop.spec.js index e8d3f59aabc..64aedf81eae 100644 --- a/test/commands/blpop.spec.js +++ b/test/commands/blpop.spec.js @@ -8,9 +8,9 @@ var intercept = require('intercept-stdout'); describe("The 'blpop' method", function () { - helper.allTests(function (parser, ip, args) { + helper.allTests(function (ip, args) { - describe('using ' + parser + ' and ' + ip, function () { + describe('using ' + ip, function () { var client; var bclient; diff --git a/test/commands/client.spec.js b/test/commands/client.spec.js index 7ac32ae41ac..51a55e3f16b 100644 --- a/test/commands/client.spec.js +++ b/test/commands/client.spec.js @@ -7,10 +7,10 @@ var redis = config.redis; describe("The 'client' method", function () { - helper.allTests(function (parser, ip, args) { + helper.allTests(function (ip, args) { var pattern = /addr=/; - describe('using ' + parser + ' and ' + ip, function () { + describe('using ' + ip, function () { var client; beforeEach(function (done) { diff --git a/test/commands/dbsize.spec.js b/test/commands/dbsize.spec.js index 4fdf80010d1..bd8b1467898 100644 --- a/test/commands/dbsize.spec.js +++ b/test/commands/dbsize.spec.js @@ -8,9 +8,9 @@ var uuid = require('uuid'); describe("The 'dbsize' method", function () { - helper.allTests(function (parser, ip, args) { + helper.allTests(function (ip, args) { - describe('using ' + parser + ' and ' + ip, function () { + describe('using ' + ip, function () { var key, value; beforeEach(function () { diff --git a/test/commands/del.spec.js b/test/commands/del.spec.js index 970d0886c43..86c1f4bb3af 100644 --- a/test/commands/del.spec.js +++ b/test/commands/del.spec.js @@ -6,9 +6,9 @@ var redis = config.redis; describe("The 'del' method", function () { - helper.allTests(function (parser, ip, args) { + helper.allTests(function (ip, args) { - describe('using ' + parser + ' and ' + ip, function () { + describe('using ' + ip, function () { var client; beforeEach(function (done) { diff --git a/test/commands/eval.spec.js b/test/commands/eval.spec.js index 731d656d541..db74372db4d 100644 --- a/test/commands/eval.spec.js +++ b/test/commands/eval.spec.js @@ -8,9 +8,9 @@ var redis = config.redis; describe("The 'eval' method", function () { - helper.allTests(function (parser, ip, args) { + helper.allTests(function (ip, args) { - describe('using ' + parser + ' and ' + ip, function () { + describe('using ' + ip, function () { var client; var source = "return redis.call('set', 'sha', 'test')"; diff --git a/test/commands/exists.spec.js b/test/commands/exists.spec.js index 01a1b6891d9..399a0382f49 100644 --- a/test/commands/exists.spec.js +++ b/test/commands/exists.spec.js @@ -6,9 +6,9 @@ var redis = config.redis; describe("The 'exists' method", function () { - helper.allTests(function (parser, ip, args) { + helper.allTests(function (ip, args) { - describe('using ' + parser + ' and ' + ip, function () { + describe('using ' + ip, function () { var client; beforeEach(function (done) { diff --git a/test/commands/expire.spec.js b/test/commands/expire.spec.js index f9041b71091..2891890edc0 100644 --- a/test/commands/expire.spec.js +++ b/test/commands/expire.spec.js @@ -6,9 +6,9 @@ var redis = config.redis; describe("The 'expire' method", function () { - helper.allTests(function (parser, ip, args) { + helper.allTests(function (ip, args) { - describe('using ' + parser + ' and ' + ip, function () { + describe('using ' + ip, function () { var client; beforeEach(function (done) { diff --git a/test/commands/flushdb.spec.js b/test/commands/flushdb.spec.js index 61535e2e714..a4f761d3753 100644 --- a/test/commands/flushdb.spec.js +++ b/test/commands/flushdb.spec.js @@ -8,9 +8,9 @@ var uuid = require('uuid'); describe("The 'flushdb' method", function () { - helper.allTests(function (parser, ip, args) { + helper.allTests(function (ip, args) { - describe('using ' + parser + ' and ' + ip, function () { + describe('using ' + ip, function () { var key, key2; beforeEach(function () { diff --git a/test/commands/geoadd.spec.js b/test/commands/geoadd.spec.js index 3614910322d..b45df7c83a9 100644 --- a/test/commands/geoadd.spec.js +++ b/test/commands/geoadd.spec.js @@ -6,9 +6,9 @@ var redis = config.redis; describe("The 'geoadd' method", function () { - helper.allTests(function (parser, ip, args) { + helper.allTests(function (ip, args) { - describe('using ' + parser + ' and ' + ip, function () { + describe('using ' + ip, function () { var client; beforeEach(function (done) { diff --git a/test/commands/get.spec.js b/test/commands/get.spec.js index e2b9a7db071..acbfc0d10db 100644 --- a/test/commands/get.spec.js +++ b/test/commands/get.spec.js @@ -8,9 +8,9 @@ var uuid = require('uuid'); describe("The 'get' method", function () { - helper.allTests(function (parser, ip, args) { + helper.allTests(function (ip, args) { - describe('using ' + parser + ' and ' + ip, function () { + describe('using ' + ip, function () { var key, value; beforeEach(function () { diff --git a/test/commands/getset.spec.js b/test/commands/getset.spec.js index e5da8573119..48dd7e9d739 100644 --- a/test/commands/getset.spec.js +++ b/test/commands/getset.spec.js @@ -8,9 +8,9 @@ var uuid = require('uuid'); describe("The 'getset' method", function () { - helper.allTests(function (parser, ip, args) { + helper.allTests(function (ip, args) { - describe('using ' + parser + ' and ' + ip, function () { + describe('using ' + ip, function () { var key, value, value2; beforeEach(function () { diff --git a/test/commands/hgetall.spec.js b/test/commands/hgetall.spec.js index 6c00e3ed099..b74995427a1 100644 --- a/test/commands/hgetall.spec.js +++ b/test/commands/hgetall.spec.js @@ -7,9 +7,9 @@ var redis = config.redis; describe("The 'hgetall' method", function () { - helper.allTests(function (parser, ip, args) { + helper.allTests(function (ip, args) { - describe('using ' + parser + ' and ' + ip, function () { + describe('using ' + ip, function () { var client; describe('regular client', function () { @@ -51,7 +51,7 @@ describe("The 'hgetall' method", function () { describe('binary client', function () { var client; - var args = config.configureClient(parser, ip, { + var args = config.configureClient(ip, { return_buffers: true }); diff --git a/test/commands/hincrby.spec.js b/test/commands/hincrby.spec.js index e94232d9a0e..10b4523b3f7 100644 --- a/test/commands/hincrby.spec.js +++ b/test/commands/hincrby.spec.js @@ -6,9 +6,9 @@ var redis = config.redis; describe("The 'hincrby' method", function () { - helper.allTests(function (parser, ip, args) { + helper.allTests(function (ip, args) { - describe('using ' + parser + ' and ' + ip, function () { + describe('using ' + ip, function () { var client; var hash = 'test hash'; diff --git a/test/commands/hlen.spec.js b/test/commands/hlen.spec.js index 5dcab6ce8e2..f1f94fec025 100644 --- a/test/commands/hlen.spec.js +++ b/test/commands/hlen.spec.js @@ -6,9 +6,9 @@ var redis = config.redis; describe("The 'hlen' method", function () { - helper.allTests(function (parser, ip, args) { + helper.allTests(function (ip, args) { - describe('using ' + parser + ' and ' + ip, function () { + describe('using ' + ip, function () { var client; beforeEach(function (done) { diff --git a/test/commands/hmget.spec.js b/test/commands/hmget.spec.js index 09bb89f258e..3676b5b7312 100644 --- a/test/commands/hmget.spec.js +++ b/test/commands/hmget.spec.js @@ -7,9 +7,9 @@ var redis = config.redis; describe("The 'hmget' method", function () { - helper.allTests(function (parser, ip, args) { + helper.allTests(function (ip, args) { - describe('using ' + parser + ' and ' + ip, function () { + describe('using ' + ip, function () { var client; var hash = 'test hash'; diff --git a/test/commands/hmset.spec.js b/test/commands/hmset.spec.js index 93514cc2295..8ba54ecc3f2 100644 --- a/test/commands/hmset.spec.js +++ b/test/commands/hmset.spec.js @@ -7,9 +7,9 @@ var redis = config.redis; describe("The 'hmset' method", function () { - helper.allTests(function (parser, ip, args) { + helper.allTests(function (ip, args) { - describe('using ' + parser + ' and ' + ip, function () { + describe('using ' + ip, function () { var client; var hash = 'test hash'; diff --git a/test/commands/hset.spec.js b/test/commands/hset.spec.js index c62b17713b0..d94a7aa0f2b 100644 --- a/test/commands/hset.spec.js +++ b/test/commands/hset.spec.js @@ -7,9 +7,9 @@ var redis = config.redis; describe("The 'hset' method", function () { - helper.allTests(function (parser, ip, args) { + helper.allTests(function (ip, args) { - describe('using ' + parser + ' and ' + ip, function () { + describe('using ' + ip, function () { var client; var hash = 'test hash'; diff --git a/test/commands/incr.spec.js b/test/commands/incr.spec.js index f1f1e78ee8c..0caab84859a 100644 --- a/test/commands/incr.spec.js +++ b/test/commands/incr.spec.js @@ -7,9 +7,9 @@ var redis = config.redis; describe("The 'incr' method", function () { - helper.allTests(function (parser, ip, args) { + helper.allTests(function (ip, args) { - describe('using ' + parser + ' and ' + ip, function () { + describe('using ' + ip, function () { describe('when connected and a value in Redis', function () { diff --git a/test/commands/info.spec.js b/test/commands/info.spec.js index 39a9e9f5cce..4e5bb481fc9 100644 --- a/test/commands/info.spec.js +++ b/test/commands/info.spec.js @@ -7,9 +7,9 @@ var redis = config.redis; describe("The 'info' method", function () { - helper.allTests(function (parser, ip, args) { + helper.allTests(function (ip, args) { - describe('using ' + parser + ' and ' + ip, function () { + describe('using ' + ip, function () { var client; beforeEach(function (done) { diff --git a/test/commands/keys.spec.js b/test/commands/keys.spec.js index 1aff0cea146..6ce45790b6d 100644 --- a/test/commands/keys.spec.js +++ b/test/commands/keys.spec.js @@ -8,9 +8,9 @@ var redis = config.redis; describe("The 'keys' method", function () { - helper.allTests(function (parser, ip, args) { + helper.allTests(function (ip, args) { - describe('using ' + parser + ' and ' + ip, function () { + describe('using ' + ip, function () { var client; beforeEach(function (done) { diff --git a/test/commands/mget.spec.js b/test/commands/mget.spec.js index 83d69f837f9..a2c671f683c 100644 --- a/test/commands/mget.spec.js +++ b/test/commands/mget.spec.js @@ -7,9 +7,9 @@ var redis = config.redis; describe("The 'mget' method", function () { - helper.allTests(function (parser, ip, args) { + helper.allTests(function (ip, args) { - describe('using ' + parser + ' and ' + ip, function () { + describe('using ' + ip, function () { var client; beforeEach(function (done) { diff --git a/test/commands/monitor.spec.js b/test/commands/monitor.spec.js index a6c98747309..7465ac4eb84 100644 --- a/test/commands/monitor.spec.js +++ b/test/commands/monitor.spec.js @@ -8,7 +8,7 @@ var redis = config.redis; describe("The 'monitor' method", function () { - helper.allTests(function (parser, ip, args) { + helper.allTests(function (ip, args) { var client; @@ -62,7 +62,7 @@ describe("The 'monitor' method", function () { end(err); }); monitorClient.subscribe('foo', 'baz', function (err, res) { - // The return value might change in v.3 + // The return value might change in v.4 // assert.strictEqual(res, 'baz'); // TODO: Fix the return value of subscribe calls end(err); diff --git a/test/commands/mset.spec.js b/test/commands/mset.spec.js index 9fac90728cf..b60f383134b 100644 --- a/test/commands/mset.spec.js +++ b/test/commands/mset.spec.js @@ -8,9 +8,9 @@ var uuid = require('uuid'); describe("The 'mset' method", function () { - helper.allTests(function (parser, ip, args) { + helper.allTests(function (ip, args) { - describe('using ' + parser + ' and ' + ip, function () { + describe('using ' + ip, function () { var key, value, key2, value2; beforeEach(function () { diff --git a/test/commands/msetnx.spec.js b/test/commands/msetnx.spec.js index a2f2ab17249..179f33744e6 100644 --- a/test/commands/msetnx.spec.js +++ b/test/commands/msetnx.spec.js @@ -6,9 +6,9 @@ var redis = config.redis; describe("The 'msetnx' method", function () { - helper.allTests(function (parser, ip, args) { + helper.allTests(function (ip, args) { - describe('using ' + parser + ' and ' + ip, function () { + describe('using ' + ip, function () { var client; beforeEach(function (done) { diff --git a/test/commands/randomkey.test.js b/test/commands/randomkey.test.js index cf453e12e4b..226194f9214 100644 --- a/test/commands/randomkey.test.js +++ b/test/commands/randomkey.test.js @@ -7,9 +7,9 @@ var redis = config.redis; describe("The 'randomkey' method", function () { - helper.allTests(function (parser, ip, args) { + helper.allTests(function (ip, args) { - describe('using ' + parser + ' and ' + ip, function () { + describe('using ' + ip, function () { var client; beforeEach(function (done) { diff --git a/test/commands/rename.spec.js b/test/commands/rename.spec.js index cb3d7c31688..284fba310ed 100644 --- a/test/commands/rename.spec.js +++ b/test/commands/rename.spec.js @@ -6,9 +6,9 @@ var redis = config.redis; describe("The 'rename' method", function () { - helper.allTests(function (parser, ip, args) { + helper.allTests(function (ip, args) { - describe('using ' + parser + ' and ' + ip, function () { + describe('using ' + ip, function () { var client; beforeEach(function (done) { diff --git a/test/commands/renamenx.spec.js b/test/commands/renamenx.spec.js index 3da640a0d8d..b56b0a1a5c9 100644 --- a/test/commands/renamenx.spec.js +++ b/test/commands/renamenx.spec.js @@ -6,9 +6,9 @@ var redis = config.redis; describe("The 'renamenx' method", function () { - helper.allTests(function (parser, ip, args) { + helper.allTests(function (ip, args) { - describe('using ' + parser + ' and ' + ip, function () { + describe('using ' + ip, function () { var client; beforeEach(function (done) { diff --git a/test/commands/rpush.spec.js b/test/commands/rpush.spec.js index d137dc6473d..793d5d2d804 100644 --- a/test/commands/rpush.spec.js +++ b/test/commands/rpush.spec.js @@ -7,9 +7,9 @@ var assert = require('assert'); describe("The 'rpush' command", function () { - helper.allTests(function (parser, ip, args) { + helper.allTests(function (ip, args) { - describe('using ' + parser + ' and ' + ip, function () { + describe('using ' + ip, function () { var client; beforeEach(function (done) { diff --git a/test/commands/sadd.spec.js b/test/commands/sadd.spec.js index c2316739b76..442f391b9de 100644 --- a/test/commands/sadd.spec.js +++ b/test/commands/sadd.spec.js @@ -7,9 +7,9 @@ var redis = config.redis; describe("The 'sadd' method", function () { - helper.allTests(function (parser, ip, args) { + helper.allTests(function (ip, args) { - describe('using ' + parser + ' and ' + ip, function () { + describe('using ' + ip, function () { var client; beforeEach(function (done) { diff --git a/test/commands/scard.spec.js b/test/commands/scard.spec.js index 5cf9b4eb73c..e327eb282a2 100644 --- a/test/commands/scard.spec.js +++ b/test/commands/scard.spec.js @@ -6,9 +6,9 @@ var redis = config.redis; describe("The 'scard' method", function () { - helper.allTests(function (parser, ip, args) { + helper.allTests(function (ip, args) { - describe('using ' + parser + ' and ' + ip, function () { + describe('using ' + ip, function () { var client; beforeEach(function (done) { diff --git a/test/commands/script.spec.js b/test/commands/script.spec.js index 2e29ad553ab..c374f5b5e17 100644 --- a/test/commands/script.spec.js +++ b/test/commands/script.spec.js @@ -8,11 +8,11 @@ var redis = config.redis; describe("The 'script' method", function () { - helper.allTests(function (parser, ip, args) { + helper.allTests(function (ip, args) { var command = 'return 99'; var commandSha = crypto.createHash('sha1').update(command).digest('hex'); - describe('using ' + parser + ' and ' + ip, function () { + describe('using ' + ip, function () { var client; beforeEach(function (done) { diff --git a/test/commands/sdiff.spec.js b/test/commands/sdiff.spec.js index e3963ecdf0c..95f81f09bd0 100644 --- a/test/commands/sdiff.spec.js +++ b/test/commands/sdiff.spec.js @@ -7,9 +7,9 @@ var redis = config.redis; describe("The 'sdiff' method", function () { - helper.allTests(function (parser, ip, args) { + helper.allTests(function (ip, args) { - describe('using ' + parser + ' and ' + ip, function () { + describe('using ' + ip, function () { var client; beforeEach(function (done) { diff --git a/test/commands/sdiffstore.spec.js b/test/commands/sdiffstore.spec.js index 1797ca9e435..fe822b561b5 100644 --- a/test/commands/sdiffstore.spec.js +++ b/test/commands/sdiffstore.spec.js @@ -7,9 +7,9 @@ var redis = config.redis; describe("The 'sdiffstore' method", function () { - helper.allTests(function (parser, ip, args) { + helper.allTests(function (ip, args) { - describe('using ' + parser + ' and ' + ip, function () { + describe('using ' + ip, function () { var client; beforeEach(function (done) { diff --git a/test/commands/select.spec.js b/test/commands/select.spec.js index 66a66f389b0..053496e337f 100644 --- a/test/commands/select.spec.js +++ b/test/commands/select.spec.js @@ -7,9 +7,9 @@ var redis = config.redis; describe("The 'select' method", function () { - helper.allTests(function (parser, ip, args) { + helper.allTests(function (ip, args) { - describe('using ' + parser + ' and ' + ip, function () { + describe('using ' + ip, function () { describe('when not connected', function () { var client; diff --git a/test/commands/set.spec.js b/test/commands/set.spec.js index 360cffe5f59..d2d36491a96 100644 --- a/test/commands/set.spec.js +++ b/test/commands/set.spec.js @@ -8,9 +8,9 @@ var uuid = require('uuid'); describe("The 'set' method", function () { - helper.allTests(function (parser, ip, args) { + helper.allTests(function (ip, args) { - describe('using ' + parser + ' and ' + ip, function () { + describe('using ' + ip, function () { var key, value; beforeEach(function () { diff --git a/test/commands/setex.spec.js b/test/commands/setex.spec.js index 9a3bb53f0b1..a2126e6dbb6 100644 --- a/test/commands/setex.spec.js +++ b/test/commands/setex.spec.js @@ -7,9 +7,9 @@ var redis = config.redis; describe("The 'setex' method", function () { - helper.allTests(function (parser, ip, args) { + helper.allTests(function (ip, args) { - describe('using ' + parser + ' and ' + ip, function () { + describe('using ' + ip, function () { var client; beforeEach(function (done) { diff --git a/test/commands/setnx.spec.js b/test/commands/setnx.spec.js index 2bce9f0a0ba..4b4688c0a68 100644 --- a/test/commands/setnx.spec.js +++ b/test/commands/setnx.spec.js @@ -6,9 +6,9 @@ var redis = config.redis; describe("The 'setnx' method", function () { - helper.allTests(function (parser, ip, args) { + helper.allTests(function (ip, args) { - describe('using ' + parser + ' and ' + ip, function () { + describe('using ' + ip, function () { var client; beforeEach(function (done) { diff --git a/test/commands/sinter.spec.js b/test/commands/sinter.spec.js index b614a41ea4c..c4fc7759556 100644 --- a/test/commands/sinter.spec.js +++ b/test/commands/sinter.spec.js @@ -7,9 +7,9 @@ var redis = config.redis; describe("The 'sinter' method", function () { - helper.allTests(function (parser, ip, args) { + helper.allTests(function (ip, args) { - describe('using ' + parser + ' and ' + ip, function () { + describe('using ' + ip, function () { var client; beforeEach(function (done) { diff --git a/test/commands/sinterstore.spec.js b/test/commands/sinterstore.spec.js index de7de87e10f..1ea4c4b109b 100644 --- a/test/commands/sinterstore.spec.js +++ b/test/commands/sinterstore.spec.js @@ -7,9 +7,9 @@ var redis = config.redis; describe("The 'sinterstore' method", function () { - helper.allTests(function (parser, ip, args) { + helper.allTests(function (ip, args) { - describe('using ' + parser + ' and ' + ip, function () { + describe('using ' + ip, function () { var client; beforeEach(function (done) { diff --git a/test/commands/sismember.spec.js b/test/commands/sismember.spec.js index 69482b3b564..37ac1c466aa 100644 --- a/test/commands/sismember.spec.js +++ b/test/commands/sismember.spec.js @@ -6,9 +6,9 @@ var redis = config.redis; describe("The 'sismember' method", function () { - helper.allTests(function (parser, ip, args) { + helper.allTests(function (ip, args) { - describe('using ' + parser + ' and ' + ip, function () { + describe('using ' + ip, function () { var client; beforeEach(function (done) { diff --git a/test/commands/slowlog.spec.js b/test/commands/slowlog.spec.js index 7f5417dbd8f..21f3f8007ac 100644 --- a/test/commands/slowlog.spec.js +++ b/test/commands/slowlog.spec.js @@ -7,9 +7,9 @@ var redis = config.redis; describe("The 'slowlog' method", function () { - helper.allTests(function (parser, ip, args) { + helper.allTests(function (ip, args) { - describe('using ' + parser + ' and ' + ip, function () { + describe('using ' + ip, function () { var client; beforeEach(function (done) { diff --git a/test/commands/smembers.spec.js b/test/commands/smembers.spec.js index 8fbdcbba5ed..0bc8143719f 100644 --- a/test/commands/smembers.spec.js +++ b/test/commands/smembers.spec.js @@ -7,9 +7,9 @@ var redis = config.redis; describe("The 'smembers' method", function () { - helper.allTests(function (parser, ip, args) { + helper.allTests(function (ip, args) { - describe('using ' + parser + ' and ' + ip, function () { + describe('using ' + ip, function () { var client; beforeEach(function (done) { diff --git a/test/commands/smove.spec.js b/test/commands/smove.spec.js index eb8eae10545..969c264b756 100644 --- a/test/commands/smove.spec.js +++ b/test/commands/smove.spec.js @@ -6,9 +6,9 @@ var redis = config.redis; describe("The 'smove' method", function () { - helper.allTests(function (parser, ip, args) { + helper.allTests(function (ip, args) { - describe('using ' + parser + ' and ' + ip, function () { + describe('using ' + ip, function () { var client; beforeEach(function (done) { diff --git a/test/commands/sort.spec.js b/test/commands/sort.spec.js index 63b933eaef6..2ee08c44e21 100644 --- a/test/commands/sort.spec.js +++ b/test/commands/sort.spec.js @@ -34,9 +34,9 @@ function setupData (client, done) { describe("The 'sort' method", function () { - helper.allTests(function (parser, ip, args) { + helper.allTests(function (ip, args) { - describe('using ' + parser + ' and ' + ip, function () { + describe('using ' + ip, function () { var client; beforeEach(function (done) { diff --git a/test/commands/spop.spec.js b/test/commands/spop.spec.js index 6e0697c02a5..ec3e93fda3f 100644 --- a/test/commands/spop.spec.js +++ b/test/commands/spop.spec.js @@ -7,9 +7,9 @@ var redis = config.redis; describe("The 'spop' method", function () { - helper.allTests(function (parser, ip, args) { + helper.allTests(function (ip, args) { - describe('using ' + parser + ' and ' + ip, function () { + describe('using ' + ip, function () { var client; beforeEach(function (done) { diff --git a/test/commands/srem.spec.js b/test/commands/srem.spec.js index 97c40d9ce2d..d325cb57151 100644 --- a/test/commands/srem.spec.js +++ b/test/commands/srem.spec.js @@ -7,9 +7,9 @@ var redis = config.redis; describe("The 'srem' method", function () { - helper.allTests(function (parser, ip, args) { + helper.allTests(function (ip, args) { - describe('using ' + parser + ' and ' + ip, function () { + describe('using ' + ip, function () { var client; beforeEach(function (done) { diff --git a/test/commands/sunion.spec.js b/test/commands/sunion.spec.js index 44f5f247206..cc8eb624758 100644 --- a/test/commands/sunion.spec.js +++ b/test/commands/sunion.spec.js @@ -7,9 +7,9 @@ var redis = config.redis; describe("The 'sunion' method", function () { - helper.allTests(function (parser, ip, args) { + helper.allTests(function (ip, args) { - describe('using ' + parser + ' and ' + ip, function () { + describe('using ' + ip, function () { var client; beforeEach(function (done) { diff --git a/test/commands/sunionstore.spec.js b/test/commands/sunionstore.spec.js index c9869bdf881..bd64c6f6b79 100644 --- a/test/commands/sunionstore.spec.js +++ b/test/commands/sunionstore.spec.js @@ -7,9 +7,9 @@ var redis = config.redis; describe("The 'sunionstore' method", function () { - helper.allTests(function (parser, ip, args) { + helper.allTests(function (ip, args) { - describe('using ' + parser + ' and ' + ip, function () { + describe('using ' + ip, function () { var client; beforeEach(function (done) { diff --git a/test/commands/ttl.spec.js b/test/commands/ttl.spec.js index 65212f710c2..e176d41cb84 100644 --- a/test/commands/ttl.spec.js +++ b/test/commands/ttl.spec.js @@ -7,9 +7,9 @@ var redis = config.redis; describe("The 'ttl' method", function () { - helper.allTests(function (parser, ip, args) { + helper.allTests(function (ip, args) { - describe('using ' + parser + ' and ' + ip, function () { + describe('using ' + ip, function () { var client; beforeEach(function (done) { diff --git a/test/commands/type.spec.js b/test/commands/type.spec.js index 4a0c4d2897c..f70d79e9ef6 100644 --- a/test/commands/type.spec.js +++ b/test/commands/type.spec.js @@ -6,9 +6,9 @@ var redis = config.redis; describe("The 'type' method", function () { - helper.allTests(function (parser, ip, args) { + helper.allTests(function (ip, args) { - describe('using ' + parser + ' and ' + ip, function () { + describe('using ' + ip, function () { var client; beforeEach(function (done) { diff --git a/test/commands/watch.spec.js b/test/commands/watch.spec.js index cf908646750..52a9b26f751 100644 --- a/test/commands/watch.spec.js +++ b/test/commands/watch.spec.js @@ -7,11 +7,11 @@ var redis = config.redis; describe("The 'watch' method", function () { - helper.allTests(function (parser, ip, args) { + helper.allTests(function (ip, args) { var watched = 'foobar'; - describe('using ' + parser + ' and ' + ip, function () { + describe('using ' + ip, function () { var client; beforeEach(function (done) { diff --git a/test/commands/zadd.spec.js b/test/commands/zadd.spec.js index e0153ba11bb..827630a389c 100644 --- a/test/commands/zadd.spec.js +++ b/test/commands/zadd.spec.js @@ -7,9 +7,9 @@ var redis = config.redis; describe("The 'zadd' method", function () { - helper.allTests(function (parser, ip, args) { + helper.allTests(function (ip, args) { - describe('using ' + parser + ' and ' + ip, function () { + describe('using ' + ip, function () { var client; beforeEach(function (done) { diff --git a/test/commands/zscan.spec.js b/test/commands/zscan.spec.js index 6d4a1a60c8a..eb8acf44dbf 100644 --- a/test/commands/zscan.spec.js +++ b/test/commands/zscan.spec.js @@ -7,9 +7,9 @@ var redis = config.redis; describe("The 'zscan' method", function () { - helper.allTests(function (parser, ip, args) { + helper.allTests(function (ip, args) { - describe('using ' + parser + ' and ' + ip, function () { + describe('using ' + ip, function () { var client; beforeEach(function (done) { diff --git a/test/commands/zscore.spec.js b/test/commands/zscore.spec.js index 9d24d7a7cf0..8b95e527641 100644 --- a/test/commands/zscore.spec.js +++ b/test/commands/zscore.spec.js @@ -7,9 +7,9 @@ var redis = config.redis; describe("The 'zscore' method", function () { - helper.allTests(function (parser, ip, args) { + helper.allTests(function (ip, args) { - describe('using ' + parser + ' and ' + ip, function () { + describe('using ' + ip, function () { var client; beforeEach(function (done) { diff --git a/test/connection.spec.js b/test/connection.spec.js index 7ecee698530..0913a26ff6b 100644 --- a/test/connection.spec.js +++ b/test/connection.spec.js @@ -147,9 +147,9 @@ describe('connection tests', function () { }); - helper.allTests(function (parser, ip, args) { + helper.allTests(function (ip, args) { - describe('using ' + parser + ' and ' + ip, function () { + describe('using ' + ip, function () { describe('on lost connection', function () { it('emit an error after max retry timeout and do not try to reconnect afterwards', function (done) { @@ -158,7 +158,6 @@ describe('connection tests', function () { var connect_timeout = 600; // in ms client = redis.createClient({ - parser: parser, connect_timeout: connect_timeout }); var time = 0; @@ -189,7 +188,6 @@ describe('connection tests', function () { it('end connection while retry is still ongoing', function (done) { var connect_timeout = 1000; // in ms client = redis.createClient({ - parser: parser, connect_timeout: connect_timeout }); @@ -304,7 +302,6 @@ describe('connection tests', function () { it('emit an error after the socket timeout exceeded the connect_timeout time', function (done) { var connect_timeout = 500; // in ms client = redis.createClient({ - parser: parser, // Auto detect ipv4 and use non routable ip to trigger the timeout host: '10.255.255.1', connect_timeout: connect_timeout @@ -337,7 +334,6 @@ describe('connection tests', function () { it('use the system socket timeout if the connect_timeout has not been provided', function (done) { client = redis.createClient({ - parser: parser, host: '2001:db8::ff00:42:8329' // auto detect ip v6 }); assert.strictEqual(client.address, '2001:db8::ff00:42:8329:6379'); @@ -350,21 +346,20 @@ describe('connection tests', function () { it('clears the socket timeout after a connection has been established', function (done) { client = redis.createClient({ - parser: parser, connect_timeout: 1000 }); process.nextTick(function () { - // node > 4 + // node > 6 var timeout = client.stream.timeout; - // node <= 4 + // node <= 6 if (timeout === undefined) timeout = client.stream._idleTimeout; assert.strictEqual(timeout, 1000); }); client.on('connect', function () { - // node > 4 + // node > 6 var expected = 0; var timeout = client.stream.timeout; - // node <= 4 + // node <= 6 if (timeout === undefined) { timeout = client.stream._idleTimeout; expected = -1; @@ -379,7 +374,6 @@ describe('connection tests', function () { client = redis.createClient({ host: 'localhost', port: '6379', - parser: parser, connect_timeout: 1000 }); @@ -392,7 +386,6 @@ describe('connection tests', function () { } client = redis.createClient({ path: '/tmp/redis.sock', - parser: parser, connect_timeout: 1000 }); diff --git a/test/detect_buffers.spec.js b/test/detect_buffers.spec.js index 2e2f7f1ed02..a656c549435 100644 --- a/test/detect_buffers.spec.js +++ b/test/detect_buffers.spec.js @@ -8,7 +8,7 @@ var redis = config.redis; describe('detect_buffers', function () { var client; - var args = config.configureClient('javascript', 'localhost', { + var args = config.configureClient('localhost', { detect_buffers: true }); diff --git a/test/helper.js b/test/helper.js index 29a07d6f319..3e1437d14ab 100644 --- a/test/helper.js +++ b/test/helper.js @@ -161,7 +161,6 @@ module.exports = { cb = opts; opts = {}; } - var parsers = ['javascript']; var protocols = ['IPv4']; if (process.platform !== 'win32') { protocols.push('IPv6', '/tmp/redis.sock'); @@ -180,13 +179,11 @@ module.exports = { } } describe('using options: ' + strOptions, function () { - parsers.forEach(function (parser) { - protocols.forEach(function (ip, i) { - if (i !== 0 && !opts.allConnections) { - return; - } - cb(parser, ip, config.configureClient(parser, ip, options)); - }); + protocols.forEach(function (ip, i) { + if (i !== 0 && !opts.allConnections) { + return; + } + cb(ip, config.configureClient(ip, options)); }); }); }); diff --git a/test/lib/config.js b/test/lib/config.js index 0420b032ce3..d363f83e04b 100644 --- a/test/lib/config.js +++ b/test/lib/config.js @@ -16,7 +16,7 @@ var config = { IPv4: '127.0.0.1', IPv6: '::1' }, - configureClient: function (parser, ip, opts) { + configureClient: function (ip, opts) { var args = []; // Do not manipulate the opts => copy them each time opts = opts ? JSON.parse(JSON.stringify(opts)) : {}; @@ -28,8 +28,6 @@ var config = { args.push(config.HOST[ip]); opts.family = ip; } - - opts.parser = parser; args.push(opts); return args; diff --git a/test/multi.spec.js b/test/multi.spec.js index 233ead776c1..498168f9d56 100644 --- a/test/multi.spec.js +++ b/test/multi.spec.js @@ -93,9 +93,9 @@ describe("The 'multi' method", function () { }); - helper.allTests(function (parser, ip, args) { + helper.allTests(function (ip, args) { - describe('using ' + parser + ' and ' + ip, function () { + describe('using ' + ip, function () { describe('when not connected', function () { diff --git a/test/node_redis.spec.js b/test/node_redis.spec.js index 3c511ec9af9..79f58dd5187 100644 --- a/test/node_redis.spec.js +++ b/test/node_redis.spec.js @@ -79,9 +79,9 @@ describe('The node_redis client', function () { client.stream.destroy(); }); - helper.allTests(function (parser, ip, args) { + helper.allTests(function (ip, args) { - describe('using ' + parser + ' and ' + ip, function () { + describe('using ' + ip, function () { afterEach(function () { client.end(true); @@ -375,7 +375,6 @@ describe('The node_redis client', function () { it('should retry all commands instead of returning an error if a command did not yet return after a connection loss', function (done) { var bclient = redis.createClient({ - parser: parser, retry_unfulfilled_commands: true }); bclient.blpop('blocking list 2', 5, function (err, value) { @@ -394,7 +393,6 @@ describe('The node_redis client', function () { it('should retry all commands even if the offline queue is disabled', function (done) { var bclient = redis.createClient({ - parser: parser, enableOfflineQueue: false, retryUnfulfilledCommands: true }); @@ -751,7 +749,7 @@ describe('The node_redis client', function () { }); }); - // TODO: consider allowing loading commands in v.3 + // TODO: consider allowing loading commands in v.4 // it('should fire early', function (done) { // client = redis.createClient.apply(null, args); // var fired = false; @@ -884,9 +882,7 @@ describe('The node_redis client', function () { }); it('flushes the command queue if connection is lost', function (done) { - client = redis.createClient({ - parser: parser - }); + client = redis.createClient(); client.once('ready', function () { var multi = client.multi(); @@ -938,7 +934,6 @@ describe('The node_redis client', function () { it('stream not writable', function (done) { client = redis.createClient({ - parser: parser, enable_offline_queue: false }); client.on('ready', function () { @@ -952,7 +947,6 @@ describe('The node_redis client', function () { it('emit an error and does not enqueues operation', function (done) { client = redis.createClient(9999, null, { - parser: parser, max_attempts: 0, enable_offline_queue: false }); @@ -977,7 +971,6 @@ describe('The node_redis client', function () { it('flushes the command queue if connection is lost', function (done) { client = redis.createClient({ - parser: parser, enable_offline_queue: false }); diff --git a/test/prefix.spec.js b/test/prefix.spec.js index e34805a7a9b..52fd39c1ccd 100644 --- a/test/prefix.spec.js +++ b/test/prefix.spec.js @@ -7,14 +7,13 @@ var redis = config.redis; describe('prefix key names', function () { - helper.allTests(function (parser, ip, args) { + helper.allTests(function (ip, args) { - describe('using ' + parser + ' and ' + ip, function () { + describe('using ' + ip, function () { var client = null; beforeEach(function (done) { client = redis.createClient({ - parser: parser, prefix: 'test:prefix:' }); client.on('ready', function () { diff --git a/test/pubsub.spec.js b/test/pubsub.spec.js index da2561459fe..e0c71adf91d 100644 --- a/test/pubsub.spec.js +++ b/test/pubsub.spec.js @@ -7,9 +7,9 @@ var redis = config.redis; describe('publish/subscribe', function () { - helper.allTests(function (parser, ip, args) { + helper.allTests(function (ip, args) { - describe('using ' + parser + ' and ' + ip, function () { + describe('using ' + ip, function () { var pub = null; var sub = null; var channel = 'test channel'; diff --git a/test/rename.spec.js b/test/rename.spec.js index b8f7c65d0d8..f43eee35ca8 100644 --- a/test/rename.spec.js +++ b/test/rename.spec.js @@ -17,9 +17,9 @@ describe('rename commands', function () { }); }); - helper.allTests(function (parser, ip, args) { + helper.allTests(function (ip, args) { - describe('using ' + parser + ' and ' + ip, function () { + describe('using ' + ip, function () { var client = null; beforeEach(function (done) { @@ -29,7 +29,6 @@ describe('rename commands', function () { set: '807081f5afa96845a02816a28b7258c3', GETRANGE: '9e3102b15cf231c4e9e940f284744fe0' }, - parser: parser }); client.on('ready', function () { @@ -124,7 +123,6 @@ describe('rename commands', function () { rename_commands: { set: '807081f5afa96845a02816a28b7258c3' }, - parser: parser, prefix: 'baz' }); client.set('foo', 'bar'); diff --git a/test/return_buffers.spec.js b/test/return_buffers.spec.js index eb18d79393f..ba40c26c373 100644 --- a/test/return_buffers.spec.js +++ b/test/return_buffers.spec.js @@ -7,11 +7,11 @@ var redis = config.redis; describe('return_buffers', function () { - helper.allTests(function (parser, ip, basicArgs) { + helper.allTests(function (ip, basicArgs) { - describe('using ' + parser + ' and ' + ip, function () { + describe('using ' + ip, function () { var client; - var args = config.configureClient(parser, ip, { + var args = config.configureClient(ip, { return_buffers: true, detect_buffers: true }); @@ -243,7 +243,7 @@ describe('return_buffers', function () { var channel = 'test channel'; var message = new Buffer('test message'); - var args = config.configureClient(parser, ip, { + var args = config.configureClient(ip, { return_buffers: true });