Skip to content

Commit 223a0e1

Browse files
committed
Revert "chore: use redis-mock for tests"
This reverts commit 9681e17.
1 parent 86f0ba2 commit 223a0e1

7 files changed

+18
-39
lines changed

package.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@
3636
"chai-as-promised": "^7.1.1",
3737
"eslint": "^5.15.1",
3838
"mocha": "^6.0.2",
39-
"nyc": "^13.3.0",
40-
"redis-mock": "^0.43.0"
39+
"nyc": "^13.3.0"
4140
},
4241
"dependencies": {
4342
"redis": "^2.8.0"

src/promisifyRedis.js

+12-18
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,15 @@
11
const {RedisClient} = require('redis');
22

3-
function promisifyRedisClient(proto) {
4-
Object.entries(proto).filter(v => typeof v[1] === 'function').forEach(([key, func]) => {
5-
if (proto['p' + key]) return;
6-
7-
proto['p' + key] = function(...args) {
8-
return new Promise((resolve, reject) => {
9-
func.call(this, ...args, (err, res) => {
10-
/* istanbul ignore next */
11-
if (err) reject(err);
12-
else resolve(res);
13-
});
3+
Object.entries(RedisClient.prototype).filter(v => typeof v[1] === 'function').forEach(([key, func]) => {
4+
if (RedisClient.prototype['p' + key]) return;
5+
6+
RedisClient.prototype['p' + key] = function(...args) {
7+
return new Promise((resolve, reject) => {
8+
func.call(this, ...args, (err, res) => {
9+
/* istanbul ignore next */
10+
if (err) reject(err);
11+
else resolve(res);
1412
});
15-
};
16-
});
17-
}
18-
19-
promisifyRedisClient(RedisClient.prototype);
20-
21-
module.exports = promisifyRedisClient;
13+
});
14+
};
15+
});

test/ChildWrapper.test.js

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
const {expect, use} = require('chai');
22
const chaiAsPromised = require('chai-as-promised');
3-
const redis = require('redis-mock');
3+
const redis = require('redis');
44
const Redite = require('../');
5-
const promisifyRedisClient = require('../src/promisifyRedis');
65
const {
76
promisify,
87
DB,
@@ -13,7 +12,6 @@ const {
1312
} = require('./lib/consts');
1413

1514
use(chaiAsPromised);
16-
promisifyRedisClient(redis.RedisClient.prototype);
1715

1816
const client = redis.createClient({db: DB});
1917
const wrapper = new Redite({client});
@@ -174,7 +172,7 @@ describe('ChildWrapper', () => {
174172
});
175173
});
176174

177-
it.only('should edit an item in a list without overriding any parts of it', async () => {
175+
it('should edit an item in a list without overriding any parts of it', async () => {
178176
await wrapper.test[0].foo.bar.set(TestHash);
179177
await wrapper.test[0].foo.TestHash.set(TestVal);
180178
await expect(wrapper.test[0]).to.become({

test/Redite.test.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,14 @@
22

33
const {expect, use} = require('chai');
44
const chaiAsPromised = require('chai-as-promised');
5-
const redis = require('redis-mock');
5+
const redis = require('redis');
66
const Redite = require('../');
7-
const promisifyRedisClient = require('../src/promisifyRedis');
87
const {
98
promisify,
109
DB
1110
} = require('./lib/consts');
1211

1312
use(chaiAsPromised);
14-
promisifyRedisClient(redis.RedisClient.prototype);
1513

1614
const client = redis.createClient({db: DB});
1715
const wrapper = new Redite({client});

test/arrayMethods.test.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
const {expect, use} = require('chai');
22
const chaiAsPromised = require('chai-as-promised');
3-
const redis = require('redis-mock');
3+
const redis = require('redis');
44
const Redite = require('../');
5-
const promisifyRedisClient = require('../src/promisifyRedis');
65
const {
76
promisify,
87
DB,
@@ -16,7 +15,6 @@ const {
1615
} = require('./lib/consts');
1716

1817
use(chaiAsPromised);
19-
promisifyRedisClient(redis.RedisClient.prototype);
2018

2119
const client = redis.createClient({db: DB});
2220
const wrapper = new Redite({client});

test/other.test.js

+1-4
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
const {expect, use} = require('chai');
44
const chaiAsPromised = require('chai-as-promised');
55
const redis = require('redis');
6-
const redisMock = require('redis-mock');
7-
const promisifyRedisClient = require('../src/promisifyRedis');
86
const {inspect: {custom}} = require('util');
97
const {fork} = require('child_process');
108
const Redite = require('../');
@@ -15,9 +13,8 @@ const {
1513
} = require('./lib/consts');
1614

1715
use(chaiAsPromised);
18-
promisifyRedisClient(redisMock.RedisClient.prototype);
1916

20-
const client = redisMock.createClient({db: DB});
17+
const client = redis.createClient({db: DB});
2118
const wrapper = new Redite({
2219
client,
2320
customInspection: true,

yarn.lock

-5
Original file line numberDiff line numberDiff line change
@@ -1974,11 +1974,6 @@ redis-commands@^1.2.0:
19741974
resolved "https://registry.yarnpkg.com/redis-commands/-/redis-commands-1.4.0.tgz#52f9cf99153efcce56a8f86af986bd04e988602f"
19751975
integrity sha512-cu8EF+MtkwI4DLIT0x9P8qNTLFhQD4jLfxLR0cCNkeGzs87FN6879JOJwNQR/1zD7aSYNbU0hgsV9zGY71Itvw==
19761976

1977-
redis-mock@^0.43.0:
1978-
version "0.43.0"
1979-
resolved "https://registry.yarnpkg.com/redis-mock/-/redis-mock-0.43.0.tgz#e05bef36b75f7332d41c13828d63baf7b47bced1"
1980-
integrity sha512-ayNlCxbeaVp16U5HU220C24lFk7TEzW8hL4RE5SXv/GeKq+P4ek1QqKKbu0K2QkGRdO2bvHE2ymJ/pbBLqyUww==
1981-
19821977
redis-parser@^2.6.0:
19831978
version "2.6.0"
19841979
resolved "https://registry.yarnpkg.com/redis-parser/-/redis-parser-2.6.0.tgz#52ed09dacac108f1a631c07e9b69941e7a19504b"

0 commit comments

Comments
 (0)