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

chore: refactor codebase to promises

This commit is contained in:
Ruben Bridgewater
2017-05-19 06:14:29 +02:00
parent b2613b2270
commit 6be5575c5b
85 changed files with 2081 additions and 3690 deletions

View File

@@ -1,6 +1,5 @@
'use strict'
const assert = require('assert')
const config = require('../lib/config')
const helper = require('../helper')
const redis = config.redis
@@ -20,19 +19,15 @@ describe('The \'getset\' method', () => {
describe('when not connected', () => {
let client
beforeEach((done) => {
beforeEach(() => {
client = redis.createClient.apply(null, args)
client.once('ready', () => {
client.quit()
})
client.on('end', done)
return client.quit()
})
it('reports an error', (done) => {
client.get(key, (err, res) => {
assert(err.message.match(/The connection is already closed/))
done()
})
it('reports an error', () => {
return client.get(key)
.then(helper.fail)
.catch(helper.isError(/The connection is already closed/))
})
})
@@ -41,9 +36,7 @@ describe('The \'getset\' method', () => {
beforeEach((done) => {
client = redis.createClient.apply(null, args)
client.once('ready', () => {
done()
})
client.once('ready', done)
})
afterEach(() => {
@@ -51,50 +44,35 @@ describe('The \'getset\' method', () => {
})
describe('when the key exists in Redis', () => {
beforeEach((done) => {
client.set(key, value, (err, res) => {
helper.isNotError()(err, res)
done()
})
beforeEach(() => {
return client.set(key, value).then(helper.isString('OK'))
})
it('gets the value correctly', (done) => {
client.getset(key, value2, (err, res) => {
helper.isString(value)(err, res)
client.get(key, (err, res) => {
helper.isString(value2)(err, res)
done(err)
})
})
it('gets the value correctly', () => {
return Promise.all([
client.getset(key, value2).then(helper.isString(value)),
client.get(key).then(helper.isString(value2))
])
})
it('gets the value correctly with array syntax', (done) => {
client.getset([key, value2], (err, res) => {
helper.isString(value)(err, res)
client.get(key, (err, res) => {
helper.isString(value2)(err, res)
done(err)
})
})
it('gets the value correctly with array syntax', () => {
return Promise.all([
client.getset([key, value2]).then(helper.isString(value)),
client.get(key).then(helper.isString(value2))
])
})
it('gets the value correctly with array syntax style 2', (done) => {
client.getset(key, [value2], (err, res) => {
helper.isString(value)(err, res)
client.get(key, (err, res) => {
helper.isString(value2)(err, res)
done(err)
})
})
it('gets the value correctly with array syntax style 2', () => {
return Promise.all([
client.getset(key, [value2]).then(helper.isString(value)),
client.get(key).then(helper.isString(value2))
])
})
})
describe('when the key does not exist in Redis', () => {
it('gets a null value', (done) => {
client.getset(key, value, (err, res) => {
helper.isNull()(err, res)
done(err)
})
it('gets a null value', () => {
return client.getset(key, value).then(helper.isNull())
})
})
})