Merge branch 'SassNinja-fix/connection-error'

Author: idealley

src/redisClient.js

@@ -8,6 +8,7 @@ export default function redisClient() { // eslint-disable-line no-unused-vars
   const redisOptions = Object.assign({}, this.get('redis'), {
     retry_strategy: function (options) { // eslint-disable-line camelcase
       app.set('redisClient', undefined);
+      /* istanbul ignore next */
       if (cacheOptions.env !== 'test') {
         console.log(`${chalk.yellow('[redis]')} not connected`);
       }
@@ -16,8 +17,11 @@ export default function redisClient() { // eslint-disable-line no-unused-vars
   });
   const client = redis.createClient(redisOptions);
 
+  app.set('redisClient', client);
+
   client.on('ready', () => {
     app.set('redisClient', client);
+    /* istanbul ignore next */
     if (cacheOptions.env !== 'test') {
       console.log(`${chalk.green('[redis]')} connected`);
     }

test/hooks/redis-after.test.js

@@ -666,6 +666,41 @@ describe('Redis After Hook', () => {
     });
   });
 
+  it ('does not save anything in cache if redisClient offline', () => {
+    const hook = a();
+    const clientDummy = {
+      keys: [],
+      set: function(key, val) {
+        this.keys.push(key);
+      },
+      expire: function() {},
+      rpush: function() {},
+    };
+    const mock = {
+      params: { query: '' },
+      path: 'dummy',
+      id: 'do-not-save',
+      result: {
+        cache: {}
+      },
+      app: {
+        get: (what) => {
+          // comment in to emulate redisClient online (will cause test fail)
+          // if (what === 'redisClient') {
+          //   return clientDummy;
+          // }
+        }
+      }
+    };
+    const prevKeys = clientDummy.keys.join();
+
+    return hook(mock).then(result => {
+      const currKeys = clientDummy.keys.join();
+
+      expect(currKeys).to.equal(prevKeys);
+    });
+  });
+
   // after(() => {
   //   client.del('parent');
   //   client.del('parent?full=true');

test/hooks/redis-before.test.js

@@ -240,6 +240,24 @@ describe('Redis Before Hook', () => {
     });
   });
 
+  it('does not return any result if redisClient offline', () => {
+    const hook = b();
+    const mock = {
+      params: { query: ''},
+      path: '',
+      id: '',
+      app: {
+        get: (what) => {}
+      }
+    };
+
+    return hook(mock).then(result => {
+      const data = result.result;
+
+      expect(data).to.be.undefined;
+    });
+  });
+
   after(() => {
     client.del('before-test-route');
     client.del('before-test-route?full=true');