Added test for the redisClient, reorganised folders

Author: idealley

package.json

@@ -41,7 +41,7 @@
     "build": "webpack --env build --mode production",
     "dev": "webpack --progress --colors --watch --env dev --mode development",
     "dev-travis": "webpack --mode production && npm run test",
-    "mocha": "mocha --require babel-core/register --colors ./test/*.test.js --exit",
+    "mocha": "mocha --require babel-core/register --colors ./test/ --recursive --exit",
     "reporter": "NODE_ENV=test nyc npm run mocha",
     "test": "npm run reporter",
     "test:redis-after": "NODE_ENV=test nyc mocha --require babel-core/register --colors ./test/redis-after.test.js --watch",

src/index.js

@@ -5,7 +5,7 @@ import { removeCacheInformation as hookRemoveCacheInformation } from './hooks/ca
 import { before as redisBeforeHook} from './hooks/redis';
 import { after as redisAfterHook} from './hooks/redis';
 
-export {
+export default {
   redisClient,
   cacheRoutes,
   hookCache,

src/redisClient.js

@@ -2,4 +2,5 @@ import redis from 'redis';
 
 export default function redisClient() { // eslint-disable-line no-unused-vars
   this.set('redisClient', redis.createClient(this.get('redis')));
+  return this;
 }

test/redis-after.test.js test/hooks/redis-after.test.jstest/redis-after.test.js renamed to test/hooks/redis-after.test.js

@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 import redis from 'redis';
-import { redisAfterHook as a } from '../src';
+import { redisAfterHook as a } from '../../src';
 // import moment from 'moment';
 
 const client = redis.createClient();

test/redis-before.test.js test/hooks/redis-before.test.jstest/redis-before.test.js renamed to test/hooks/redis-before.test.js

@@ -1,7 +1,7 @@
 import { expect } from 'chai';
 import redis from 'redis';
 import moment from 'moment';
-import { redisBeforeHook as b, redisAfterHook as a } from '../src';
+import { redisBeforeHook as b, redisAfterHook as a } from '../../src';
 
 const client = redis.createClient();
 

test/redis-remove-hook.test.js test/hooks/redis-remove-hook.test.jstest/redis-remove-hook.test.js renamed to test/hooks/redis-remove-hook.test.js

@@ -1,7 +1,7 @@
 import { expect } from 'chai';
 import redis from 'redis';
 import moment from 'moment';
-import { hookRemoveCacheInformation as r } from '../src';
+import { hookRemoveCacheInformation as r } from '../../src';
 
 const client = redis.createClient();
 

test/index.test.js

@@ -1,23 +1,28 @@
 import { expect } from 'chai';
-import { redisClient, cacheRoutes, redisAfterHook, redisBeforeHook, hookRemoveCacheInformation } from '../src';
+import * as lib from '../src';
 
 describe('feathers-hooks-rediscache', () => {
   it('loads Redis Client', () => {
-    expect(typeof redisClient).to.equal('function', 'It worked');
+    expect(lib).to.respondTo('redisClient');
   });
+
   it('loads routes', () => {
-    expect(typeof cacheRoutes).to.equal('function', 'It worked');
+    expect(lib).to.respondTo('cacheRoutes');
   });
+
   it('loads the after Redis Cache hook', () => {
-    expect(typeof redisAfterHook).to.equal('function', 'It worked');
+    expect(lib).to.respondTo('redisAfterHook');
   });
+
   it('loads the before Redis Cache hook', () => {
-    expect(typeof redisBeforeHook).to.equal('function', 'It worked');
+    expect(lib).to.respondTo('redisBeforeHook');
   });
+
   it('loads the remove Redis Cache Object hook', () => {
-    expect(typeof hookRemoveCacheInformation).to.equal('function', 'It worked');
+    expect(lib).to.respondTo('hookRemoveCacheInformation');
   });
+
   it('loads the cache hook', () => {
-    expect(typeof redisBeforeHook).to.equal('function', 'It worked');
+    expect(lib).to.respondTo('hookCache');
   });
 });

test/run-last/redis-client.test.js

@@ -0,0 +1,40 @@
+import { expect } from 'chai';
+import { redisClient } from '../../src';
+
+describe('Redis Before Hook', () => {
+
+  it('It loads and responds', () => {
+    expect(typeof redisClient).to.equal('function');
+  });
+
+  it('Loads the client with custom settings', () => {
+    const c = redisClient.bind({
+      set: function (key, value) {
+        this[key] = value;
+      },
+      get: function (key) {
+        return {
+          host: 'my-redis-service.example.com',
+          port: 1234
+        };
+      }
+    });
+    const result = c();
+
+    expect(result.redisClient.address).to.equal('my-redis-service.example.com:1234');
+  });
+
+  it('Loads the client with defaults', () => {
+    const c = redisClient.bind({
+      set: function (key, value) {
+        this[key] = value;
+      },
+      get: function (key) {
+        return null;
+      }
+    });
+    const result = c();
+
+    expect(result.redisClient.address).to.equal('127.0.0.1:6379');
+  });
+});