add more tests

Author: pasupulaphani

lib/redis_pool.js

@@ -6,7 +6,7 @@ const logger = require("./logger");
 
 const debug = require("debug")("simpleRedisPool");
 
-function RedisPool (name, redisOptions={}, poolOptions={}) {
+function RedisPool (name, redisOptions, poolOptions) {
 
   this._redisDb = redisOptions.db || 0;
 

lib/redis_store.js

@@ -9,105 +9,101 @@ function RedisStore (name, redisOptions, poolOptions) {
   const pool = new RedisPool(name, redisOptions, poolOptions);
   logger.info("Redis store created.", pool.status());
 
-  function release (conn) {
-    return pool.release(conn);
-  }
-
   this.getName = bind(pool.getName, pool);
   this.getDB = bind(pool.getDB, pool);
   this.status = bind(pool.status, pool);
 
-  this.get = function (key) {
+  this.get = (key) => {
 
     return pool.acquire()
-      .then(function (conn) {
+      .then((conn) => {
         return conn.getAsync(key)
-          .then(function (result) {
-            release(conn);
+          .then((result) => {
+            pool.release(conn);
             return result;
           });
       });
   };
 
-  this.set = function (key, value) {
+  this.set = (key, value) => {
 
     return pool.acquire()
-      .then(function (conn) {
+      .then((conn) => {
         return conn.setAsync(key, value)
-          .then(function (result) {
-            release(conn);
+          .then((result) => {
+            pool.release(conn);
             return result;
           });
       });
   };
 
-  this.setex = function (key, value, ttl) {
+  this.setex = (key, value, ttlInSeconds) => {
 
     return pool.acquire()
-      .then(function (conn) {
-        return conn.setexAsync(key, ttl, value)
-          .then(function (result) {
-            release(conn);
+      .then((conn) => {
+        return conn.setexAsync(key, ttlInSeconds, value)
+          .then((result) => {
+            pool.release(conn);
             return result;
           });
       });
   };
 
-  this.del = function (key) {
+  this.del = (key) => {
 
     return pool.acquire()
-      .then(function (conn) {
+      .then((conn) => {
         return conn.delAsync(key)
-          .then(function (result) {
-            release(conn);
+          .then((result) => {
+            pool.release(conn);
             return result;
           });
       });
   };
 
-  this.ttl = function (key) {
+  this.ttlInSeconds = (key) => {
 
     return pool.acquire()
-      .then(function (conn) {
-        return conn.ttlAsync(key)
-          .then(function (result) {
-            release(conn);
+      .then((conn) => {
+        return conn.ttlInSecondsAsync(key)
+          .then((result) => {
+            pool.release(conn);
             return result;
           });
       });
   };
 
-  this.keys = function (pattern) {
+  this.keys = (pattern) => {
     if (!pattern || pattern === "") {
       pattern = "*";
     }
 
     return pool.acquire()
-      .then(function (conn) {
+      .then((conn) => {
         return conn.keysAsync(pattern)
-          .then(function (result) {
-            release(conn);
+          .then((result) => {
+            pool.release(conn);
             return result;
           });
       });
   };
 
 
-  this.deleteAll = function (pattern) {
+  this.deleteAll = (pattern) => {
     if (!pattern || pattern === "") {
       pattern = "*";
     }
     logger.info("clearing redis keys: ", pattern);
 
     return pool.acquire()
-      .then(function (conn) {
+      .then((conn) => {
         return conn.keysAsync(pattern)
-          .then(function (keys) {
+          .then((keys) => {
             if (keys.length > 0) {
               debug("deleting keys ", keys);
               return conn.delAsync(keys)
-                .then(function (result) {
-                  release(conn);
+                .then((result) => {
+                  pool.release(conn);
                   return result;
                 });
             }

test/index.js

@@ -1,4 +1,5 @@
-require("should");
+const should = require("should");
+const Bluebird = require("bluebird");
 const RedisStore = require("../lib/redis_store");
 
 describe("redisStore", function () {
@@ -8,6 +9,28 @@ describe("redisStore", function () {
   });
   const store = new RedisStore("testStore", redisOptions);
 
+  describe("get", function () {
+
+    const key = "chuck-norris";
+    const value = "superman";
+
+    before(function (done) {
+      store.set(key, value)
+        .then(function () {
+          done();
+        });
+    });
+
+    it("get", function (done) {
+
+      store.get(key)
+        .then(function (v) {
+          v.should.be.equal(value);
+          done();
+        });
+    });
+  });
+
   describe("set", function () {
     it("set", function (done) {
 
@@ -19,25 +42,32 @@ describe("redisStore", function () {
     });
   });
 
-  describe("get", function () {
+  describe("setex", function () {
+    it("setex", function (done) {
 
-    const key = "chuck-norris";
-    const value = "alias: superman";
+      const key = "shortLivedKey";
+      const value = "expireIn10ms";
+      const ttlInSeconds = 1;
 
-    before(function (done) {
-      store.set(key, value)
-        .then(function () {
-          done();
+      store.setex(key, value, ttlInSeconds)
+        .then(function (test) {
+          test.should.be.ok();
         });
-    });
-
-    it("get", function (done) {
 
       store.get(key)
         .then(function (v) {
           v.should.be.equal(value);
-          done();
         });
+
+      Bluebird.delay(ttlInSeconds * 1000)
+        .done(() => {
+          return store.get(key)
+            .then(function (v) {
+              should(v).be.null;
+              done();
+            });
+        });
+
     });
   });
 });