Skip to content

Commit cf4e69f

Browse files
committed
refactor: update deps and tests
1 parent c8753b8 commit cf4e69f

File tree

6 files changed

+14
-31
lines changed

6 files changed

+14
-31
lines changed

gulpfile.js

Lines changed: 0 additions & 9 deletions
This file was deleted.

index.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
const _ = require('lodash');
2-
const Promise = require('bluebird');
32
const DataLoader = require('dataloader');
43
const stringify = require('json-stable-stringify');
54

5+
const mapPromise = (promise, fn) => Promise.all(promise.map(fn));
6+
67
module.exports = fig => {
78
const redis = fig.redis;
89
const isIORedis = redis.constructor.name !== 'RedisClient';
@@ -73,7 +74,7 @@ module.exports = fig => {
7374
(err, results) => {
7475
return err
7576
? reject(err)
76-
: Promise.map(results, r => parse(r, opt)).then(resolve);
77+
: mapPromise(results, r => parse(r, opt)).then(resolve);
7778
}
7879
)
7980
);
@@ -101,7 +102,7 @@ module.exports = fig => {
101102
this.loader = new DataLoader(
102103
keys =>
103104
rMGet(this.keySpace, keys, this.opt).then(results =>
104-
Promise.map(results, (v, i) => {
105+
mapPromise(results, (v, i) => {
105106
if (v === '') {
106107
return Promise.resolve(null);
107108
} else if (v === null) {

package.json

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"description": "DataLoader Using Redis as a Cache",
55
"main": "index.js",
66
"scripts": {
7-
"test": "gulp test"
7+
"test": "mocha test/**/*.unit.js"
88
},
99
"repository": {
1010
"type": "git",
@@ -28,19 +28,16 @@
2828
},
2929
"homepage": "https://github.com/PatrickJS/redis-dataloader#readme",
3030
"dependencies": {
31-
"bluebird": "^3.5.0",
3231
"dataloader": "^1.2.0",
33-
"ioredis": "^3.1.2",
3432
"json-stable-stringify": "^1.0.1",
3533
"lodash": "^4.17.2"
3634
},
3735
"devDependencies": {
3836
"chai": "^3.5.0",
3937
"chai-as-promised": "^7.1.1",
40-
"gulp": "^3.9.1",
41-
"gulp-mocha": "^3.0.1",
42-
"ioredis": "^3.1.2",
38+
"mocha": "^8.1.1",
4339
"redis": "^2.6.3",
40+
"redis-mock": "^0.51.0",
4441
"sinon": "^1.17.6"
4542
}
4643
}

test/ioredis.unit.js

Lines changed: 0 additions & 5 deletions
This file was deleted.

test/redis.unit.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
require('./test')({
22
name: 'with driver "redis"',
3-
redis: require('redis').createClient(),
3+
redis: require('redis-mock').createClient(),
44
});

test/test.js

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
const _ = require('lodash');
2-
const Promise = require('bluebird');
32
const chai = require('chai');
43
chai.use(require('chai-as-promised'));
54
const { expect } = chai;
65
const sinon = require('sinon');
76
const DataLoader = require('dataloader');
87
const createRedisDataLoader = require('../index');
98

9+
const mapPromise = (promise, fn) => Promise.all(promise.map(fn));
10+
1011
module.exports = ({ name, redis }) => {
1112
const RedisDataLoader = createRedisDataLoader({ redis });
1213

@@ -50,11 +51,11 @@ module.exports = ({ name, redis }) => {
5051
.returns(Promise.resolve({ ball: 'bat' }));
5152

5253
this.userLoader = () =>
53-
new DataLoader(keys => Promise.map(keys, this.loadFn), {
54+
new DataLoader(keys => mapPromise(keys, this.loadFn), {
5455
cache: false,
5556
});
5657

57-
return Promise.map(
58+
return mapPromise(
5859
_.keys(this.data).concat(['{"a":1,"b":2}', '[1,2]']),
5960
k => rDel(`${this.keySpace}:${k}`)
6061
).then(() => {
@@ -188,12 +189,10 @@ module.exports = ({ name, redis }) => {
188189
expect(data).to.deep.equal(this.data.json);
189190
expect(this.loadFn.callCount).to.equal(2);
190191
done();
191-
})
192-
.done();
192+
});
193193
}, 1100);
194194
})
195-
.catch(done)
196-
.done();
195+
.catch(done);
197196
});
198197

199198
it('should handle custom serialize and deserialize method', () => {

0 commit comments

Comments
 (0)