1
0
mirror of https://github.com/redis/node-redis.git synced 2025-08-06 02:15:48 +03:00

chore - remove standard and use individual config

Standard is not as up to date and still uses a old eslint version.
Instead, use the airbnb default with a couple of modifications.

All required changes are included.
This commit is contained in:
Ruben Bridgewater
2017-11-28 21:38:21 -02:00
parent 0206ecbf51
commit 2b4ab10305
97 changed files with 888 additions and 673 deletions

View File

@@ -3,7 +3,8 @@
const assert = require('assert')
const config = require('../lib/config')
const helper = require('../helper')
const redis = config.redis
const { redis } = config
const intercept = require('intercept-stdout')
describe('The \'blpop\' method', () => {

View File

@@ -1,10 +1,11 @@
'use strict'
const Buffer = require('buffer').Buffer
const { Buffer } = require('buffer')
const assert = require('assert')
const config = require('../lib/config')
const helper = require('../helper')
const redis = config.redis
const { redis } = config
describe('The \'client\' method', () => {
helper.allTests((ip, args) => {
@@ -144,8 +145,9 @@ describe('The \'client\' method', () => {
})
it('sets the name', () => {
// The querys are auto pipelined and the response is a response to all querys of one client
// per chunk. So the execution order is only guaranteed on each client
// The querys are auto pipelined and the response is a response to all
// querys of one client per chunk. So the execution order is only
// guaranteed on each client
return Promise.all([
client.client('setname', 'RUTH'),
client2.client('setname', ['RENEE']).then(helper.isString('OK')),

View File

@@ -3,13 +3,15 @@
const assert = require('assert')
const config = require('../lib/config')
const helper = require('../helper')
const redis = config.redis
const { redis } = config
const uuid = require('uuid')
describe('The \'dbsize\' method', () => {
helper.allTests((ip, args) => {
describe(`using ${ip}`, () => {
let key, value
let key
let value
beforeEach(() => {
key = uuid.v4()

View File

@@ -2,7 +2,8 @@
const config = require('../lib/config')
const helper = require('../helper')
const redis = config.redis
const { redis } = config
describe('The \'del\' method', () => {
helper.allTests((ip, args) => {

View File

@@ -4,7 +4,8 @@ const assert = require('assert')
const config = require('../lib/config')
const crypto = require('crypto')
const helper = require('../helper')
const redis = config.redis
const { redis } = config
describe('The \'eval\' method', () => {
helper.allTests((ip, args) => {
@@ -121,7 +122,8 @@ describe('The \'eval\' method', () => {
.rpush('mylist', 'a')
.rpush('mylist', 'b')
.rpush('mylist', 'c')
.exec().then((replies) => {
.exec()
.then((replies) => {
return client.eval('local foo = redis.call(\'lrange\',\'mylist\',0,-1); return {type(foo),foo[1],foo[2],foo[3],# foo}', 0).then((res) => {
assert.strictEqual(5, res.length)
assert.strictEqual('table', res[0])

View File

@@ -2,7 +2,8 @@
const config = require('../lib/config')
const helper = require('../helper')
const redis = config.redis
const { redis } = config
describe('The \'exists\' method', () => {
helper.allTests((ip, args) => {

View File

@@ -2,7 +2,8 @@
const config = require('../lib/config')
const helper = require('../helper')
const redis = config.redis
const { redis } = config
describe('The \'expire\' method', () => {
helper.allTests((ip, args) => {

View File

@@ -2,13 +2,15 @@
const config = require('../lib/config')
const helper = require('../helper')
const redis = config.redis
const { redis } = config
const uuid = require('uuid')
describe('The \'flushdb\' method', () => {
helper.allTests((ip, args) => {
describe(`using ${ip}`, () => {
let key, key2
let key
let key2
beforeEach(() => {
key = uuid.v4()

View File

@@ -2,7 +2,8 @@
const config = require('../lib/config')
const helper = require('../helper')
const redis = config.redis
const { redis } = config
describe('The \'geoadd\' method', () => {
helper.allTests((ip, args) => {

View File

@@ -2,13 +2,15 @@
const config = require('../lib/config')
const helper = require('../helper')
const redis = config.redis
const { redis } = config
const uuid = require('uuid')
describe('The \'get\' method', () => {
helper.allTests((ip, args) => {
describe(`using ${ip}`, () => {
let key, value
let key
let value
beforeEach(() => {
key = uuid.v4()

View File

@@ -2,13 +2,16 @@
const config = require('../lib/config')
const helper = require('../helper')
const redis = config.redis
const { redis } = config
const uuid = require('uuid')
describe('The \'getset\' method', () => {
helper.allTests((ip, args) => {
describe(`using ${ip}`, () => {
let key, value, value2
let key
let value
let value2
beforeEach(() => {
key = uuid.v4()

View File

@@ -1,10 +1,11 @@
'use strict'
const Buffer = require('buffer').Buffer
const { Buffer } = require('buffer')
const assert = require('assert')
const config = require('../lib/config')
const helper = require('../helper')
const redis = config.redis
const { redis } = config
describe('The \'hgetall\' method', () => {
helper.allTests((ip, args) => {

View File

@@ -2,7 +2,8 @@
const config = require('../lib/config')
const helper = require('../helper')
const redis = config.redis
const { redis } = config
describe('The \'hincrby\' method', () => {
helper.allTests((ip, args) => {

View File

@@ -1,9 +1,10 @@
'use strict'
const Buffer = require('buffer').Buffer
const { Buffer } = require('buffer')
const config = require('../lib/config')
const helper = require('../helper')
const redis = config.redis
const { redis } = config
describe('The \'hlen\' method', () => {
helper.allTests((ip, args) => {

View File

@@ -2,7 +2,8 @@
const config = require('../lib/config')
const helper = require('../helper')
const redis = config.redis
const { redis } = config
describe('The \'hmget\' method', () => {
helper.allTests((ip, args) => {
@@ -13,7 +14,7 @@ describe('The \'hmget\' method', () => {
beforeEach(() => {
client = redis.createClient.apply(null, args)
client.flushdb()
return client.hmset(hash, {'0123456789': 'abcdefghij', 'some manner of key': 'a type of value'})
return client.hmset(hash, { '0123456789': 'abcdefghij', 'some manner of key': 'a type of value' })
.then(helper.isString('OK'))
})

View File

@@ -2,7 +2,8 @@
const config = require('../lib/config')
const helper = require('../helper')
const redis = config.redis
const { redis } = config
describe('The \'hmset\' method', () => {
helper.allTests((ip, args) => {
@@ -20,25 +21,25 @@ describe('The \'hmset\' method', () => {
return client.hgetall(hash).then(helper.isDeepEqual({
'0123456789': 'abcdefghij',
'some manner of key': 'a type of value',
'otherTypes': '555'
otherTypes: '555'
}))
})
it('handles object-style syntax', () => {
client.hmset(hash, {'0123456789': 'abcdefghij', 'some manner of key': 'a type of value', 'otherTypes': 555}).then(helper.isString('OK'))
client.hmset(hash, { '0123456789': 'abcdefghij', 'some manner of key': 'a type of value', otherTypes: 555 }).then(helper.isString('OK'))
return client.hgetall(hash).then(helper.isDeepEqual({
'0123456789': 'abcdefghij',
'some manner of key': 'a type of value',
'otherTypes': '555'
otherTypes: '555'
}))
})
it('handles object-style syntax and the key being a number', () => {
client.hmset(231232, {'0123456789': 'abcdefghij', 'some manner of key': 'a type of value', 'otherTypes': 555})
client.hmset(231232, { '0123456789': 'abcdefghij', 'some manner of key': 'a type of value', otherTypes: 555 })
return client.hgetall(231232).then(helper.isDeepEqual({
'0123456789': 'abcdefghij',
'some manner of key': 'a type of value',
'otherTypes': '555'
otherTypes: '555'
}))
})

View File

@@ -1,10 +1,11 @@
'use strict'
const Buffer = require('buffer').Buffer
const { Buffer } = require('buffer')
const assert = require('assert')
const config = require('../lib/config')
const helper = require('../helper')
const redis = config.redis
const { redis } = config
describe('The \'hset\' method', () => {
helper.allTests((ip, args) => {
@@ -43,8 +44,9 @@ describe('The \'hset\' method', () => {
it('warns if someone passed a array either as field or as value', () => {
const hash = 'test hash'
const field = 'array'
// This would be converted to "array contents" but if you use more than one entry,
// it'll result in e.g. "array contents,second content" and this is not supported and considered harmful
// This would be converted to "array contents" but if you use more than
// one entry, it'll result in e.g. "array contents,second content" and
// this is not supported and considered harmful
const value = ['array contents']
return client.hmset(hash, field, value).then(assert, helper.isError())
})

View File

@@ -2,7 +2,8 @@
const config = require('../lib/config')
const helper = require('../helper')
const redis = config.redis
const { redis } = config
describe('The \'incr\' method', () => {
helper.allTests((ip, args) => {

View File

@@ -3,7 +3,8 @@
const assert = require('assert')
const config = require('../lib/config')
const helper = require('../helper')
const redis = config.redis
const { redis } = config
describe('The \'info\' method', () => {
helper.allTests((ip, args) => {

View File

@@ -4,7 +4,8 @@ const assert = require('assert')
const config = require('../lib/config')
const crypto = require('crypto')
const helper = require('../helper')
const redis = config.redis
const { redis } = config
describe('The \'keys\' method', () => {
helper.allTests((ip, args) => {
@@ -20,8 +21,8 @@ describe('The \'keys\' method', () => {
client.mset(['test keys 1', 'test val 1', 'test keys 2', 'test val 2']).then(helper.isString('OK'))
return client.keys('test keys*').then((results) => {
assert.strictEqual(2, results.length)
assert.ok(~results.indexOf('test keys 1'))
assert.ok(~results.indexOf('test keys 2'))
assert.notStrictEqual(results.indexOf('test keys 1'), -1)
assert.notStrictEqual(results.indexOf('test keys 2'), -1)
})
})
@@ -39,7 +40,7 @@ describe('The \'keys\' method', () => {
client.mset(keysValues.reduce((a, b) => a.concat(b))).then(helper.isString('OK'))
return client.keys('multibulk:*').then((results) => {
assert.deepStrictEqual(keysValues.map((val) => val[0]).sort(), results.sort())
assert.deepStrictEqual(keysValues.map(val => val[0]).sort(), results.sort())
})
})

View File

@@ -2,7 +2,8 @@
const config = require('../lib/config')
const helper = require('../helper')
const redis = config.redis
const { redis } = config
describe('The \'mget\' method', () => {
helper.allTests((ip, args) => {

View File

@@ -1,11 +1,12 @@
'use strict'
const Buffer = require('buffer').Buffer
const { Buffer } = require('buffer')
const assert = require('assert')
const config = require('../lib/config')
const helper = require('../helper')
const utils = require('../../lib/utils')
const redis = config.redis
const { redis } = config
describe('The \'monitor\' method', () => {
helper.allTests((parser, ip, args) => {
@@ -185,8 +186,9 @@ describe('The \'monitor\' method', () => {
assert.deepStrictEqual(args, responses.shift())
assert(utils.monitorRegex.test(rawOutput), rawOutput)
if (responses.length === 0) {
// The publish is called right after the reconnect and the monitor is called before the message is emitted.
// Therefore we have to wait till the next tick
// The publish is called right after the reconnect and the monitor
// is called before the message is emitted. Therefore we have to
// wait till the next tick
process.nextTick(() => {
assert(called)
pub.end(false)

View File

@@ -3,13 +3,17 @@
const assert = require('assert')
const config = require('../lib/config')
const helper = require('../helper')
const redis = config.redis
const { redis } = config
const uuid = require('uuid')
describe('The \'mset\' method', () => {
helper.allTests((ip, args) => {
describe(`using ${ip}`, () => {
let key, value, key2, value2
let key
let value
let key2
let value2
beforeEach(() => {
key = uuid.v4()

View File

@@ -2,7 +2,8 @@
const config = require('../lib/config')
const helper = require('../helper')
const redis = config.redis
const { redis } = config
describe('The \'msetnx\' method', () => {
helper.allTests((ip, args) => {

View File

@@ -3,7 +3,8 @@
const assert = require('assert')
const config = require('../lib/config')
const helper = require('../helper')
const redis = config.redis
const { redis } = config
describe('The \'randomkey\' method', () => {
helper.allTests((ip, args) => {

View File

@@ -2,7 +2,8 @@
const config = require('../lib/config')
const helper = require('../helper')
const redis = config.redis
const { redis } = config
describe('The \'rename\' method', () => {
helper.allTests((ip, args) => {

View File

@@ -2,7 +2,8 @@
const config = require('../lib/config')
const helper = require('../helper')
const redis = config.redis
const { redis } = config
describe('The \'renamenx\' method', () => {
helper.allTests((ip, args) => {

View File

@@ -2,7 +2,8 @@
const config = require('../lib/config')
const helper = require('../helper')
const redis = config.redis
const { redis } = config
describe('The \'rpush\' command', () => {
helper.allTests((ip, args) => {

View File

@@ -3,7 +3,8 @@
const assert = require('assert')
const config = require('../lib/config')
const helper = require('../helper')
const redis = config.redis
const { redis } = config
describe('The \'sadd\' method', () => {
helper.allTests((ip, args) => {
@@ -18,7 +19,7 @@ describe('The \'sadd\' method', () => {
it('allows a single value to be added to the set', () => {
client.sadd('set0', 'member0').then(helper.isNumber(1))
return client.smembers('set0').then((res) => {
assert.ok(~res.indexOf('member0'))
assert.notStrictEqual(res.indexOf('member0'), -1)
})
})
@@ -31,9 +32,9 @@ describe('The \'sadd\' method', () => {
client.sadd('set0', ['member0', 'member1', 'member2']).then(helper.isNumber(3))
return client.smembers('set0').then((res) => {
assert.strictEqual(res.length, 3)
assert.ok(~res.indexOf('member0'))
assert.ok(~res.indexOf('member1'))
assert.ok(~res.indexOf('member2'))
assert.notStrictEqual(res.indexOf('member0'), -1)
assert.notStrictEqual(res.indexOf('member1'), -1)
assert.notStrictEqual(res.indexOf('member2'), -1)
})
})
@@ -41,9 +42,9 @@ describe('The \'sadd\' method', () => {
client.sadd(['set0', 'member0', 'member1', 'member2']).then(helper.isNumber(3))
return client.smembers('set0').then((res) => {
assert.strictEqual(res.length, 3)
assert.ok(~res.indexOf('member0'))
assert.ok(~res.indexOf('member1'))
assert.ok(~res.indexOf('member2'))
assert.notStrictEqual(res.indexOf('member0'), -1)
assert.notStrictEqual(res.indexOf('member1'), -1)
assert.notStrictEqual(res.indexOf('member2'), -1)
})
})

View File

@@ -2,7 +2,8 @@
const config = require('../lib/config')
const helper = require('../helper')
const redis = config.redis
const { redis } = config
describe('The \'scard\' method', () => {
helper.allTests((ip, args) => {

View File

@@ -3,7 +3,8 @@
const config = require('../lib/config')
const crypto = require('crypto')
const helper = require('../helper')
const redis = config.redis
const { redis } = config
describe('The \'script\' method', () => {
helper.allTests((ip, args) => {

View File

@@ -3,7 +3,8 @@
const assert = require('assert')
const config = require('../lib/config')
const helper = require('../helper')
const redis = config.redis
const { redis } = config
describe('The \'sdiff\' method', () => {
helper.allTests((ip, args) => {

View File

@@ -3,7 +3,8 @@
const assert = require('assert')
const config = require('../lib/config')
const helper = require('../helper')
const redis = config.redis
const { redis } = config
describe('The \'sdiffstore\' method', () => {
helper.allTests((ip, args) => {
@@ -28,7 +29,7 @@ describe('The \'sdiffstore\' method', () => {
return client.smembers('quux').then((values) => {
const members = values.sort()
assert.deepStrictEqual(members, [ 'b', 'x' ])
assert.deepStrictEqual(members, ['b', 'x'])
})
})

View File

@@ -3,7 +3,8 @@
const assert = require('assert')
const config = require('../lib/config')
const helper = require('../helper')
const redis = config.redis
const { redis } = config
describe('The \'select\' method', () => {
helper.allTests((ip, args) => {

View File

@@ -3,13 +3,15 @@
const assert = require('assert')
const config = require('../lib/config')
const helper = require('../helper')
const redis = config.redis
const { redis } = config
const uuid = require('uuid')
describe('The \'set\' method', () => {
helper.allTests((ip, args) => {
describe(`using ${ip}`, () => {
let key, value
let key
let value
beforeEach(() => {
key = uuid.v4()

View File

@@ -3,7 +3,8 @@
const assert = require('assert')
const config = require('../lib/config')
const helper = require('../helper')
const redis = config.redis
const { redis } = config
describe('The \'setex\' method', () => {
helper.allTests((ip, args) => {

View File

@@ -2,7 +2,8 @@
const config = require('../lib/config')
const helper = require('../helper')
const redis = config.redis
const { redis } = config
describe('The \'setnx\' method', () => {
helper.allTests((ip, args) => {

View File

@@ -3,7 +3,8 @@
const assert = require('assert')
const config = require('../lib/config')
const helper = require('../helper')
const redis = config.redis
const { redis } = config
describe('The \'sinter\' method', () => {
helper.allTests((ip, args) => {
@@ -26,7 +27,7 @@ describe('The \'sinter\' method', () => {
return client.sinter('sa', 'sb').then((intersection) => {
assert.strictEqual(intersection.length, 2)
assert.deepStrictEqual(intersection.sort(), [ 'b', 'c' ])
assert.deepStrictEqual(intersection.sort(), ['b', 'c'])
})
})

View File

@@ -2,7 +2,8 @@
const config = require('../lib/config')
const helper = require('../helper')
const redis = config.redis
const { redis } = config
describe('The \'sinterstore\' method', () => {
helper.allTests((ip, args) => {

View File

@@ -2,7 +2,8 @@
const config = require('../lib/config')
const helper = require('../helper')
const redis = config.redis
const { redis } = config
describe('The \'sismember\' method', () => {
helper.allTests((ip, args) => {

View File

@@ -3,7 +3,8 @@
const assert = require('assert')
const config = require('../lib/config')
const helper = require('../helper')
const redis = config.redis
const { redis } = config
describe('The \'slowlog\' method', () => {
helper.allTests((ip, args) => {

View File

@@ -3,7 +3,8 @@
const assert = require('assert')
const config = require('../lib/config')
const helper = require('../helper')
const redis = config.redis
const { redis } = config
describe('The \'smembers\' method', () => {
helper.allTests((ip, args) => {
@@ -21,7 +22,7 @@ describe('The \'smembers\' method', () => {
return client.smembers('foo').then((values) => {
assert.strictEqual(values.length, 2)
const members = values.sort()
assert.deepStrictEqual(members, [ 'x', 'y' ])
assert.deepStrictEqual(members, ['x', 'y'])
})
})

View File

@@ -2,7 +2,8 @@
const config = require('../lib/config')
const helper = require('../helper')
const redis = config.redis
const { redis } = config
describe('The \'smove\' method', () => {
helper.allTests((ip, args) => {

View File

@@ -2,9 +2,10 @@
const config = require('../lib/config')
const helper = require('../helper')
const redis = config.redis
function setupData (client) {
const { redis } = config
function setupData(client) {
client.rpush('y', 'd')
client.rpush('y', 'b')
client.rpush('y', 'a')

View File

@@ -2,7 +2,8 @@
const config = require('../lib/config')
const helper = require('../helper')
const redis = config.redis
const { redis } = config
describe('The \'spop\' method', () => {
helper.allTests((ip, args) => {

View File

@@ -3,7 +3,8 @@
const assert = require('assert')
const config = require('../lib/config')
const helper = require('../helper')
const redis = config.redis
const { redis } = config
describe('The \'srem\' method', () => {
helper.allTests((ip, args) => {
@@ -30,7 +31,7 @@ describe('The \'srem\' method', () => {
client.srem('set0', ['member1', 'member2']).then(helper.isNumber(2))
return client.smembers('set0').then((res) => {
assert.strictEqual(res.length, 1)
assert.ok(~res.indexOf('member0'))
assert.notStrictEqual(res.indexOf('member0'), -1)
})
})
@@ -39,7 +40,7 @@ describe('The \'srem\' method', () => {
client.sendCommand('srem', ['set0', 'member1', 'member2']).then(helper.isNumber(2))
return client.smembers('set0').then((res) => {
assert.strictEqual(res.length, 1)
assert.ok(~res.indexOf('member0'))
assert.notStrictEqual(res.indexOf('member0'), -1)
})
})
@@ -48,9 +49,9 @@ describe('The \'srem\' method', () => {
client.srem(['set0', 'member3', 'member4']).then(helper.isNumber(0))
return client.smembers('set0').then((res) => {
assert.strictEqual(res.length, 3)
assert.ok(~res.indexOf('member0'))
assert.ok(~res.indexOf('member1'))
assert.ok(~res.indexOf('member2'))
assert.notStrictEqual(res.indexOf('member0'), -1)
assert.notStrictEqual(res.indexOf('member1'), -1)
assert.notStrictEqual(res.indexOf('member2'), -1)
})
})

View File

@@ -3,7 +3,8 @@
const assert = require('assert')
const config = require('../lib/config')
const helper = require('../helper')
const redis = config.redis
const { redis } = config
describe('The \'sunion\' method', () => {
helper.allTests((ip, args) => {

View File

@@ -3,7 +3,8 @@
const assert = require('assert')
const config = require('../lib/config')
const helper = require('../helper')
const redis = config.redis
const { redis } = config
describe('The \'sunionstore\' method', () => {
helper.allTests((ip, args) => {

View File

@@ -3,7 +3,8 @@
const assert = require('assert')
const config = require('../lib/config')
const helper = require('../helper')
const redis = config.redis
const { redis } = config
describe('The \'ttl\' method', () => {
helper.allTests((ip, args) => {

View File

@@ -2,7 +2,8 @@
const config = require('../lib/config')
const helper = require('../helper')
const redis = config.redis
const { redis } = config
describe('The \'type\' method', () => {
helper.allTests((ip, args) => {

View File

@@ -3,7 +3,8 @@
const assert = require('assert')
const config = require('../lib/config')
const helper = require('../helper')
const redis = config.redis
const { redis } = config
describe('The \'watch\' method', () => {
helper.allTests((ip, args) => {

View File

@@ -3,7 +3,8 @@
const config = require('../lib/config')
const helper = require('../helper')
const assert = require('assert')
const redis = config.redis
const { redis } = config
describe('The \'zadd\' method', () => {
helper.allTests((ip, args) => {

View File

@@ -3,7 +3,8 @@
const config = require('../lib/config')
const helper = require('../helper')
const assert = require('assert')
const redis = config.redis
const { redis } = config
describe('The \'zscan\' method', () => {
helper.allTests((ip, args) => {

View File

@@ -2,7 +2,8 @@
const config = require('../lib/config')
const helper = require('../helper')
const redis = config.redis
const { redis } = config
describe('The \'zscore\' method', () => {
helper.allTests((ip, args) => {