mirror of
https://github.com/CommunitySolidServer/CommunitySolidServer.git
synced 2024-10-03 14:55:10 +00:00
chore: replace redis library with ioredis
This commit is contained in:
Arthur Joppart
Joachim Van Herwegen
parent
30ad3015f0
commit
4a37f8c879
174
package-lock.json
generated
174
package-lock.json
generated
@ -17,6 +17,7 @@
|
||||
"@types/cors": "^2.8.12",
|
||||
"@types/end-of-stream": "^1.4.1",
|
||||
"@types/fs-extra": "^9.0.13",
|
||||
"@types/ioredis": "^4.28.10",
|
||||
"@types/lodash.orderby": "^4.6.6",
|
||||
"@types/marked": "^4.0.2",
|
||||
"@types/mime-types": "^2.1.1",
|
||||
@ -26,7 +27,6 @@
|
||||
"@types/oidc-provider": "^7.8.1",
|
||||
"@types/pump": "^1.1.1",
|
||||
"@types/punycode": "^2.1.0",
|
||||
"@types/redis": "^2.8.30",
|
||||
"@types/redlock": "^4.0.1",
|
||||
"@types/sparqljs": "^3.1.3",
|
||||
"@types/url-join": "^4.0.1",
|
||||
@ -45,6 +45,7 @@
|
||||
"fetch-sparql-endpoint": "^2.4.0",
|
||||
"fs-extra": "^10.0.0",
|
||||
"handlebars": "^4.7.7",
|
||||
"ioredis": "^4.28.5",
|
||||
"jose": "^4.4.0",
|
||||
"lodash.orderby": "^4.6.0",
|
||||
"marked": "^4.0.12",
|
||||
@ -58,7 +59,6 @@
|
||||
"rdf-parse": "^1.9.1",
|
||||
"rdf-serialize": "^1.2.0",
|
||||
"rdf-terms": "^1.7.1",
|
||||
"redis": "^3.1.2",
|
||||
"redlock": "^4.2.0",
|
||||
"sparqlalgebrajs": "^4.0.2",
|
||||
"sparqljs": "^3.5.1",
|
||||
@ -4466,6 +4466,14 @@
|
||||
"@types/node": "*"
|
||||
}
|
||||
},
|
||||
"node_modules/@types/ioredis": {
|
||||
"version": "4.28.10",
|
||||
"resolved": "https://registry.npmjs.org/@types/ioredis/-/ioredis-4.28.10.tgz",
|
||||
"integrity": "sha512-69LyhUgrXdgcNDv7ogs1qXZomnfOEnSmrmMFqKgt1XMJxmoOSG/u3wYy13yACIfKuMJ8IhKgHafDO3sx19zVQQ==",
|
||||
"dependencies": {
|
||||
"@types/node": "*"
|
||||
}
|
||||
},
|
||||
"node_modules/@types/istanbul-lib-coverage": {
|
||||
"version": "2.0.3",
|
||||
"resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz",
|
||||
@ -4689,14 +4697,6 @@
|
||||
"safe-buffer": "*"
|
||||
}
|
||||
},
|
||||
"node_modules/@types/redis": {
|
||||
"version": "2.8.30",
|
||||
"resolved": "https://registry.npmjs.org/@types/redis/-/redis-2.8.30.tgz",
|
||||
"integrity": "sha512-4D3XwfIc671FSNXNruE/wmf6jWL7QYtyAhiWXJDkY41F4atMnOol4584oP4WqnW3uHe8d+Jn+wDLuQaxbfMgXQ==",
|
||||
"dependencies": {
|
||||
"@types/node": "*"
|
||||
}
|
||||
},
|
||||
"node_modules/@types/redlock": {
|
||||
"version": "4.0.1",
|
||||
"resolved": "https://registry.npmjs.org/@types/redlock/-/redlock-4.0.1.tgz",
|
||||
@ -6246,6 +6246,14 @@
|
||||
"mimic-response": "^1.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/cluster-key-slot": {
|
||||
"version": "1.1.0",
|
||||
"resolved": "https://registry.npmjs.org/cluster-key-slot/-/cluster-key-slot-1.1.0.tgz",
|
||||
"integrity": "sha512-2Nii8p3RwAPiFwsnZvukotvow2rIHM+yQ6ZcBXGHdniadkYGZYiGmkHJIbZPIV9nfv7m/U1IPMVVcAhoWFeklw==",
|
||||
"engines": {
|
||||
"node": ">=0.10.0"
|
||||
}
|
||||
},
|
||||
"node_modules/co": {
|
||||
"version": "4.6.0",
|
||||
"resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
|
||||
@ -9511,6 +9519,31 @@
|
||||
"node": ">= 0.4"
|
||||
}
|
||||
},
|
||||
"node_modules/ioredis": {
|
||||
"version": "4.28.5",
|
||||
"resolved": "https://registry.npmjs.org/ioredis/-/ioredis-4.28.5.tgz",
|
||||
"integrity": "sha512-3GYo0GJtLqgNXj4YhrisLaNNvWSNwSS2wS4OELGfGxH8I69+XfNdnmV1AyN+ZqMh0i7eX+SWjrwFKDBDgfBC1A==",
|
||||
"dependencies": {
|
||||
"cluster-key-slot": "^1.1.0",
|
||||
"debug": "^4.3.1",
|
||||
"denque": "^1.1.0",
|
||||
"lodash.defaults": "^4.2.0",
|
||||
"lodash.flatten": "^4.4.0",
|
||||
"lodash.isarguments": "^3.1.0",
|
||||
"p-map": "^2.1.0",
|
||||
"redis-commands": "1.7.0",
|
||||
"redis-errors": "^1.2.0",
|
||||
"redis-parser": "^3.0.0",
|
||||
"standard-as-callback": "^2.1.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=6"
|
||||
},
|
||||
"funding": {
|
||||
"type": "opencollective",
|
||||
"url": "https://opencollective.com/ioredis"
|
||||
}
|
||||
},
|
||||
"node_modules/is-arrayish": {
|
||||
"version": "0.3.2",
|
||||
"resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
|
||||
@ -11149,6 +11182,21 @@
|
||||
"integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
|
||||
"dev": true
|
||||
},
|
||||
"node_modules/lodash.defaults": {
|
||||
"version": "4.2.0",
|
||||
"resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz",
|
||||
"integrity": "sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw="
|
||||
},
|
||||
"node_modules/lodash.flatten": {
|
||||
"version": "4.4.0",
|
||||
"resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz",
|
||||
"integrity": "sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8="
|
||||
},
|
||||
"node_modules/lodash.isarguments": {
|
||||
"version": "3.1.0",
|
||||
"resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
|
||||
"integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo="
|
||||
},
|
||||
"node_modules/lodash.memoize": {
|
||||
"version": "4.1.2",
|
||||
"resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
|
||||
@ -12362,6 +12410,14 @@
|
||||
"node": ">=8"
|
||||
}
|
||||
},
|
||||
"node_modules/p-map": {
|
||||
"version": "2.1.0",
|
||||
"resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz",
|
||||
"integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==",
|
||||
"engines": {
|
||||
"node": ">=6"
|
||||
}
|
||||
},
|
||||
"node_modules/p-try": {
|
||||
"version": "2.2.0",
|
||||
"resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
|
||||
@ -13127,24 +13183,6 @@
|
||||
"node": ">=8"
|
||||
}
|
||||
},
|
||||
"node_modules/redis": {
|
||||
"version": "3.1.2",
|
||||
"resolved": "https://registry.npmjs.org/redis/-/redis-3.1.2.tgz",
|
||||
"integrity": "sha512-grn5KoZLr/qrRQVwoSkmzdbw6pwF+/rwODtrOr6vuBRiR/f3rjSTGupbF90Zpqm2oenix8Do6RV7pYEkGwlKkw==",
|
||||
"dependencies": {
|
||||
"denque": "^1.5.0",
|
||||
"redis-commands": "^1.7.0",
|
||||
"redis-errors": "^1.2.0",
|
||||
"redis-parser": "^3.0.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=10"
|
||||
},
|
||||
"funding": {
|
||||
"type": "opencollective",
|
||||
"url": "https://opencollective.com/node-redis"
|
||||
}
|
||||
},
|
||||
"node_modules/redis-commands": {
|
||||
"version": "1.7.0",
|
||||
"resolved": "https://registry.npmjs.org/redis-commands/-/redis-commands-1.7.0.tgz",
|
||||
@ -13810,6 +13848,11 @@
|
||||
"node": ">=8"
|
||||
}
|
||||
},
|
||||
"node_modules/standard-as-callback": {
|
||||
"version": "2.1.0",
|
||||
"resolved": "https://registry.npmjs.org/standard-as-callback/-/standard-as-callback-2.1.0.tgz",
|
||||
"integrity": "sha512-qoRRSyROncaz1z0mvYqIE4lCd9p2R90i6GxW3uZv5ucSu8tU7B5HXUP1gG8pVZsYNVaXjk8ClXHPttLyxAL48A=="
|
||||
},
|
||||
"node_modules/statuses": {
|
||||
"version": "1.5.0",
|
||||
"resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
|
||||
@ -18589,6 +18632,14 @@
|
||||
"@types/node": "*"
|
||||
}
|
||||
},
|
||||
"@types/ioredis": {
|
||||
"version": "4.28.10",
|
||||
"resolved": "https://registry.npmjs.org/@types/ioredis/-/ioredis-4.28.10.tgz",
|
||||
"integrity": "sha512-69LyhUgrXdgcNDv7ogs1qXZomnfOEnSmrmMFqKgt1XMJxmoOSG/u3wYy13yACIfKuMJ8IhKgHafDO3sx19zVQQ==",
|
||||
"requires": {
|
||||
"@types/node": "*"
|
||||
}
|
||||
},
|
||||
"@types/istanbul-lib-coverage": {
|
||||
"version": "2.0.3",
|
||||
"resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz",
|
||||
@ -18811,14 +18862,6 @@
|
||||
"safe-buffer": "*"
|
||||
}
|
||||
},
|
||||
"@types/redis": {
|
||||
"version": "2.8.30",
|
||||
"resolved": "https://registry.npmjs.org/@types/redis/-/redis-2.8.30.tgz",
|
||||
"integrity": "sha512-4D3XwfIc671FSNXNruE/wmf6jWL7QYtyAhiWXJDkY41F4atMnOol4584oP4WqnW3uHe8d+Jn+wDLuQaxbfMgXQ==",
|
||||
"requires": {
|
||||
"@types/node": "*"
|
||||
}
|
||||
},
|
||||
"@types/redlock": {
|
||||
"version": "4.0.1",
|
||||
"resolved": "https://registry.npmjs.org/@types/redlock/-/redlock-4.0.1.tgz",
|
||||
@ -19947,6 +19990,11 @@
|
||||
"mimic-response": "^1.0.0"
|
||||
}
|
||||
},
|
||||
"cluster-key-slot": {
|
||||
"version": "1.1.0",
|
||||
"resolved": "https://registry.npmjs.org/cluster-key-slot/-/cluster-key-slot-1.1.0.tgz",
|
||||
"integrity": "sha512-2Nii8p3RwAPiFwsnZvukotvow2rIHM+yQ6ZcBXGHdniadkYGZYiGmkHJIbZPIV9nfv7m/U1IPMVVcAhoWFeklw=="
|
||||
},
|
||||
"co": {
|
||||
"version": "4.6.0",
|
||||
"resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
|
||||
@ -22421,6 +22469,24 @@
|
||||
"side-channel": "^1.0.4"
|
||||
}
|
||||
},
|
||||
"ioredis": {
|
||||
"version": "4.28.5",
|
||||
"resolved": "https://registry.npmjs.org/ioredis/-/ioredis-4.28.5.tgz",
|
||||
"integrity": "sha512-3GYo0GJtLqgNXj4YhrisLaNNvWSNwSS2wS4OELGfGxH8I69+XfNdnmV1AyN+ZqMh0i7eX+SWjrwFKDBDgfBC1A==",
|
||||
"requires": {
|
||||
"cluster-key-slot": "^1.1.0",
|
||||
"debug": "^4.3.1",
|
||||
"denque": "^1.1.0",
|
||||
"lodash.defaults": "^4.2.0",
|
||||
"lodash.flatten": "^4.4.0",
|
||||
"lodash.isarguments": "^3.1.0",
|
||||
"p-map": "^2.1.0",
|
||||
"redis-commands": "1.7.0",
|
||||
"redis-errors": "^1.2.0",
|
||||
"redis-parser": "^3.0.0",
|
||||
"standard-as-callback": "^2.1.0"
|
||||
}
|
||||
},
|
||||
"is-arrayish": {
|
||||
"version": "0.3.2",
|
||||
"resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
|
||||
@ -23682,6 +23748,21 @@
|
||||
"integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
|
||||
"dev": true
|
||||
},
|
||||
"lodash.defaults": {
|
||||
"version": "4.2.0",
|
||||
"resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz",
|
||||
"integrity": "sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw="
|
||||
},
|
||||
"lodash.flatten": {
|
||||
"version": "4.4.0",
|
||||
"resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz",
|
||||
"integrity": "sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8="
|
||||
},
|
||||
"lodash.isarguments": {
|
||||
"version": "3.1.0",
|
||||
"resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
|
||||
"integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo="
|
||||
},
|
||||
"lodash.memoize": {
|
||||
"version": "4.1.2",
|
||||
"resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
|
||||
@ -24593,6 +24674,11 @@
|
||||
"p-limit": "^2.2.0"
|
||||
}
|
||||
},
|
||||
"p-map": {
|
||||
"version": "2.1.0",
|
||||
"resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz",
|
||||
"integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw=="
|
||||
},
|
||||
"p-try": {
|
||||
"version": "2.2.0",
|
||||
"resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
|
||||
@ -25212,17 +25298,6 @@
|
||||
"strip-indent": "^3.0.0"
|
||||
}
|
||||
},
|
||||
"redis": {
|
||||
"version": "3.1.2",
|
||||
"resolved": "https://registry.npmjs.org/redis/-/redis-3.1.2.tgz",
|
||||
"integrity": "sha512-grn5KoZLr/qrRQVwoSkmzdbw6pwF+/rwODtrOr6vuBRiR/f3rjSTGupbF90Zpqm2oenix8Do6RV7pYEkGwlKkw==",
|
||||
"requires": {
|
||||
"denque": "^1.5.0",
|
||||
"redis-commands": "^1.7.0",
|
||||
"redis-errors": "^1.2.0",
|
||||
"redis-parser": "^3.0.0"
|
||||
}
|
||||
},
|
||||
"redis-commands": {
|
||||
"version": "1.7.0",
|
||||
"resolved": "https://registry.npmjs.org/redis-commands/-/redis-commands-1.7.0.tgz",
|
||||
@ -25752,6 +25827,11 @@
|
||||
}
|
||||
}
|
||||
},
|
||||
"standard-as-callback": {
|
||||
"version": "2.1.0",
|
||||
"resolved": "https://registry.npmjs.org/standard-as-callback/-/standard-as-callback-2.1.0.tgz",
|
||||
"integrity": "sha512-qoRRSyROncaz1z0mvYqIE4lCd9p2R90i6GxW3uZv5ucSu8tU7B5HXUP1gG8pVZsYNVaXjk8ClXHPttLyxAL48A=="
|
||||
},
|
||||
"statuses": {
|
||||
"version": "1.5.0",
|
||||
"resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
|
||||
|
||||
@ -83,6 +83,7 @@
|
||||
"@types/cors": "^2.8.12",
|
||||
"@types/end-of-stream": "^1.4.1",
|
||||
"@types/fs-extra": "^9.0.13",
|
||||
"@types/ioredis": "^4.28.10",
|
||||
"@types/lodash.orderby": "^4.6.6",
|
||||
"@types/marked": "^4.0.2",
|
||||
"@types/mime-types": "^2.1.1",
|
||||
@ -92,7 +93,6 @@
|
||||
"@types/oidc-provider": "^7.8.1",
|
||||
"@types/pump": "^1.1.1",
|
||||
"@types/punycode": "^2.1.0",
|
||||
"@types/redis": "^2.8.30",
|
||||
"@types/redlock": "^4.0.1",
|
||||
"@types/sparqljs": "^3.1.3",
|
||||
"@types/url-join": "^4.0.1",
|
||||
@ -111,6 +111,7 @@
|
||||
"fetch-sparql-endpoint": "^2.4.0",
|
||||
"fs-extra": "^10.0.0",
|
||||
"handlebars": "^4.7.7",
|
||||
"ioredis": "^4.28.5",
|
||||
"jose": "^4.4.0",
|
||||
"lodash.orderby": "^4.6.0",
|
||||
"marked": "^4.0.12",
|
||||
@ -124,7 +125,6 @@
|
||||
"rdf-parse": "^1.9.1",
|
||||
"rdf-serialize": "^1.2.0",
|
||||
"rdf-terms": "^1.7.1",
|
||||
"redis": "^3.1.2",
|
||||
"redlock": "^4.2.0",
|
||||
"sparqlalgebrajs": "^4.0.2",
|
||||
"sparqljs": "^3.5.1",
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
import { assert } from 'console';
|
||||
import type { RedisClient } from 'redis';
|
||||
import { createClient } from 'redis';
|
||||
import Redis from 'ioredis';
|
||||
import type { Redis as RedisType } from 'ioredis';
|
||||
import type { Lock } from 'redlock';
|
||||
import Redlock from 'redlock';
|
||||
import type { ResourceIdentifier } from '../../http/representation/ResourceIdentifier';
|
||||
@ -46,7 +46,7 @@ export class RedisResourceLocker implements ResourceLocker, Finalizable {
|
||||
|
||||
public constructor(redisClients: string[], redlockOptions?: Record<string, number>) {
|
||||
this.lockMap = new Map();
|
||||
const clients = this.createRedisClients(redisClients);
|
||||
const clients: RedisType[] = this.createRedisClients(redisClients);
|
||||
if (clients.length === 0) {
|
||||
throw new Error('At least 1 client should be provided');
|
||||
}
|
||||
@ -61,8 +61,8 @@ export class RedisResourceLocker implements ResourceLocker, Finalizable {
|
||||
* @param redisClientsStrings - a list of strings that contain either a host address and a
|
||||
* port number like '127.0.0.1:6379' or just a port number like '6379'
|
||||
*/
|
||||
private createRedisClients(redisClientsStrings: string[]): RedisClient[] {
|
||||
const result: RedisClient[] = [];
|
||||
private createRedisClients(redisClientsStrings: string[]): RedisType[] {
|
||||
const result: RedisType[] = [];
|
||||
if (redisClientsStrings && redisClientsStrings.length > 0) {
|
||||
for (const client of redisClientsStrings) {
|
||||
// Check if port number or ip with port number
|
||||
@ -75,7 +75,7 @@ export class RedisResourceLocker implements ResourceLocker, Finalizable {
|
||||
}
|
||||
const port = Number(match[2]);
|
||||
const host = match[1];
|
||||
const redisclient = createClient(port, host);
|
||||
const redisclient: RedisType = new Redis(port, host);
|
||||
result.push(redisclient);
|
||||
}
|
||||
}
|
||||
@ -87,7 +87,7 @@ export class RedisResourceLocker implements ResourceLocker, Finalizable {
|
||||
* @param clients - a list of RedisClients you want to use for the redlock instance
|
||||
* @param redlockOptions - extra redlock options to overwrite the default config
|
||||
*/
|
||||
private createRedlock(clients: RedisClient[], redlockOptions: Record<string, number> = {}): Redlock {
|
||||
private createRedlock(clients: RedisType[], redlockOptions: Record<string, number> = {}): Redlock {
|
||||
try {
|
||||
return new Redlock(
|
||||
clients,
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
import { EventEmitter } from 'events';
|
||||
import redis from 'redis';
|
||||
import * as Redis from 'ioredis';
|
||||
import Redlock from 'redlock';
|
||||
import type { Lock } from 'redlock';
|
||||
import * as LogUtil from '../../../../src/logging/LogUtil';
|
||||
@ -20,19 +20,20 @@ const redlock: jest.Mocked<Redlock> = Object.assign(new EventEmitter(), {
|
||||
}) as any;
|
||||
|
||||
jest.mock('redlock', (): any => jest.fn().mockImplementation((): Redlock => redlock));
|
||||
jest.mock('ioredis', (): any => jest.fn());
|
||||
|
||||
jest.useFakeTimers();
|
||||
|
||||
describe('A RedisResourceLocker', (): void => {
|
||||
let locker: RedisResourceLocker;
|
||||
const identifier = { path: 'http://test.com/foo' };
|
||||
let createClient: jest.SpyInstance;
|
||||
let newRedisSpy: jest.SpyInstance;
|
||||
|
||||
beforeEach(async(): Promise<void> => {
|
||||
jest.clearAllMocks();
|
||||
redlock.removeAllListeners();
|
||||
|
||||
createClient = jest.spyOn(redis, 'createClient').mockImplementation(jest.fn());
|
||||
newRedisSpy = jest.spyOn(Redis, 'default').mockImplementation(jest.fn());
|
||||
|
||||
locker = new RedisResourceLocker([ '6379' ]);
|
||||
});
|
||||
@ -179,9 +180,9 @@ describe('A RedisResourceLocker', (): void => {
|
||||
jest.clearAllMocks();
|
||||
const clientStrings = [ '6379', '127.0.0.1:6378' ];
|
||||
locker = new RedisResourceLocker(clientStrings);
|
||||
expect(createClient).toHaveBeenCalledTimes(2);
|
||||
expect(createClient).toHaveBeenCalledWith(6379, undefined);
|
||||
expect(createClient).toHaveBeenCalledWith(6378, '127.0.0.1');
|
||||
expect(newRedisSpy).toHaveBeenCalledTimes(2);
|
||||
expect(newRedisSpy).toHaveBeenCalledWith(6379, undefined);
|
||||
expect(newRedisSpy).toHaveBeenCalledWith(6378, '127.0.0.1');
|
||||
});
|
||||
|
||||
it('errors when invalid string is passed.', async(): Promise<void> => {
|
||||
@ -190,7 +191,7 @@ describe('A RedisResourceLocker', (): void => {
|
||||
const clientStrings = [ 'noHostOrPort' ];
|
||||
expect((): any => new RedisResourceLocker(clientStrings))
|
||||
.toThrow('Invalid data provided to create a Redis client: noHostOrPort');
|
||||
expect(createClient).toHaveBeenCalledTimes(0);
|
||||
expect(newRedisSpy).toHaveBeenCalledTimes(0);
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user