test: update redisClient tests

Author: tokebe

__test__/unittest/redisClient.test.js

@@ -1,4 +1,4 @@
-const redisClient = require("../../src/redis-client");
+const { redisClient } = require("../../src/redis-client");
 
 describe("Test redis client", () => {
     const OLD_ENV = process.env;
@@ -11,56 +11,56 @@ describe("Test redis client", () => {
     afterAll(() => {
         process.env = OLD_ENV; // Restore old environment
     });
-    test("return empty object when REDIS_HOST is not set", () => {
-        const client = require("../../src/redis-client");
-        expect(client).toEqual({});
+    test("Client reports not enabled when REDIS_HOST is not set", () => {
+        const { redisClient } = require("../../src/redis-client");
+        expect(redisClient.clientEnabled).toEqual(false);
     })
 
     test('will receive process.env variables', () => {
         // Set the variables
         process.env.REDIS_HOST = 'localhost';
         process.env.REDIS_PORT = 3367;
-        const client = require("../../src/redis-client");
-        expect(client).not.toEqual({});
+        const { redisClient } = require("../../src/redis-client");
+        expect(redisClient).not.toEqual({});
     });
 
     test("Test if record is correctly stored", async () => {
         process.env.REDIS_HOST = 'localhost';
         process.env.REDIS_PORT = 3367;
-        const client = require("../../src/redis-client");
-        await client.setAsync(
+        const { redisClient } = require("../../src/redis-client");
+        await redisClient.client.setTimeout(
             'record1',
             'hello',
         );
-        const res = await client.getAsync('record1');
+        const res = await redisClient.client.getTimeout('record1');
         expect(res).toEqual("hello");
     })
 
     test("Test if record is correctly stored", async () => {
         process.env.REDIS_HOST = 'localhost';
         process.env.REDIS_PORT = 3367;
-        const client = require("../../src/redis-client");
-        await client.setAsync(
+        const { redisClient } = require("../../src/redis-client");
+        await redisClient.client.setTimeout(
             'record1',
             'hello',
         );
-        const res = await client.getAsync('record1');
+        const res = await redisClient.client.getTimeout('record1');
         expect(res).toEqual("hello");
     })
 
     test("Test key should be removed after ttl", async () => {
         process.env.REDIS_HOST = 'localhost';
         process.env.REDIS_PORT = 3367;
-        const client = require("../../src/redis-client");
-        await client.setAsync(
+        const { redisClient } = require("../../src/redis-client");
+        await redisClient.client.setTimeout(
             'record1',
             'hello',
             'EX',
             2
         );
         await new Promise(r => setTimeout(r, 3000));
-        const res = await client.getAsync('record1');
+        const res = await redisClient.client.getTimeout('record1');
         expect(res).not.toBeNull;
     })
 
-})
+})

jest.setup.redis-mock.js

@@ -1 +1 @@
-jest.mock('redis', () => jest.requireActual('redis-mock'));
+jest.mock('ioredis', () => jest.requireActual('ioredis-mock'));

package.json

@@ -36,9 +36,9 @@
   "homepage": "https://github.com/biothings/bte_trapi_query_graph_handler#readme",
   "devDependencies": {
     "coveralls": "^3.1.0",
+    "ioredis-mock": "^8.2.2",
     "jest": "^26.6.3",
     "prettier": "^2.2.1",
-    "redis-mock": "^0.56.3",
     "standard-version": "^9.1.1",
     "ts-jest": "^26.5.4",
     "typescript": "^4.2.3"