Tmp — do not use fakeredis for testing

.circleci/config.yml

@@ -3,6 +3,7 @@ jobs:
   "node-6":
     docker:
       - image: circleci/node:6
+      - image: redis:alpine
     working_directory: ~/repo
 
     steps:
@@ -13,6 +14,7 @@ jobs:
   "node-8":
     docker:
       - image: circleci/node:8
+      - image: redis:alpine
     working_directory: ~/repo
 
     steps:

lib/db.js

@@ -1,7 +1,4 @@
 const logger = require('./logger').db;
-const redisCommands = require('redis-commands');
-require('util.promisify/shim')(); // NOTE: shim for native node 8.0 uril.promisify
-const util = require('util');
 let db;
 
 module.exports = function () {
@@ -11,26 +8,7 @@ module.exports = function () {
   const config = require('./config');
   const redisOptions = config.systemConfig.db && config.systemConfig.db.redis;
 
-  // special mode, will emulate all redis commands.
-  // designed for demo and test scenarious to avoid having real Redis instance
-  const emulate = process.argv[2] === 'emulate' || redisOptions.emulate;
-
-  if (emulate) {
-    const redis = require('fakeredis');
-    promisify(redis.RedisClient.prototype, redisCommands.list.filter(c => c.toLowerCase() !== 'multi'));
-    promisify(redis.Multi.prototype, ['exec', 'execAtomic']);
-    db = redis.createClient(redisOptions);
-  } else {
-    db = new (require('ioredis'))(redisOptions);
-  }
-
-  function promisify (obj, methods) {
-    methods.forEach((method) => {
-      if (obj[method]) {
-        obj[method] = util.promisify(obj[method]);
-      }
-    });
-  }
+  db = new (require('ioredis'))(redisOptions);
 
   db.on('ready', function () {
     logger.debug('Redis is ready');

test/conditions.test.js

@@ -1,5 +1,3 @@
-const mock = require('mock-require');
-mock('redis', require('fakeredis'));
 
 const EgContextBase = require('../lib/gateway/context');
 require('../lib/conditions').init();
@@ -158,8 +156,8 @@ describe('req.matchEGCondition', function () {
       conditions: [{
         name: 'oneOf',
         conditions: [
-            { name: 'pathExact', path: '/foo/bar' },
-            { name: 'not', condition: { name: 'always' } }
+          { name: 'pathExact', path: '/foo/bar' },
+          { name: 'not', condition: { name: 'always' } }
         ]
       },
       {
@@ -168,7 +166,7 @@ describe('req.matchEGCondition', function () {
           name: 'oneOf',
           conditions: [
             control,
-              { name: 'pathExact', path: '/path/path/path' }
+            { name: 'pathExact', path: '/path/path/path' }
           ]
         }
       }

test/config-https-sni.test.js

@@ -1,5 +1,3 @@
-const mock = require('mock-require');
-mock('redis', require('fakeredis'));
 
 const assert = require('assert');
 const fs = require('fs');

test/config/system.config.yml

@@ -1,7 +1,7 @@
 db:
   redis:
     host: localhost
-    port: 5555
+    port: 6379
     emulate: true
     namespace: EG-TEST
 crypto:

test/e2e/policy-seq-oauth2-expression-log-ratelimit-proxy.js

@@ -1,5 +1,3 @@
-const mock = require('mock-require');
-mock('redis', require('fakeredis'));
 
 const session = require('supertest-session');
 const should = require('should');

test/fixtures/hot-reload/system.config.yml

@@ -1,7 +1,7 @@
 db:
   redis:
     host: localhost
-    port: 5555
+    port: 6379
     emulate: true
     namespace: EG-TEST
 crypto:

test/fixtures/round-robin/system.config.yml

@@ -1,7 +1,7 @@
 db:
   redis:
     host: localhost
-    port: 5555
+    port: 6379
     emulate: true
     namespace: EG-TEST
 crypto:

test/oauth/authorizationcode.test.js

@@ -1,5 +1,3 @@
-const mock = require('mock-require');
-mock('redis', require('fakeredis'));
 
 const session = require('supertest-session');
 const should = require('should');

test/oauth/client.test.js

@@ -1,5 +1,3 @@
-const mock = require('mock-require');
-mock('redis', require('fakeredis'));
 
 const session = require('supertest-session');
 const should = require('should');

test/oauth/implicit.test.js

@@ -1,5 +1,3 @@
-const mock = require('mock-require');
-mock('redis', require('fakeredis'));
 
 const session = require('supertest-session');
 const should = require('should');

test/oauth/password.test.js

@@ -1,5 +1,3 @@
-const mock = require('mock-require');
-mock('redis', require('fakeredis'));
 
 const session = require('supertest-session');
 const should = require('should');

test/policies/basic-auth-policy.test.js

@@ -1,5 +1,3 @@
-const mock = require('mock-require');
-mock('redis', require('fakeredis'));
 
 const request = require('supertest');
 const should = require('should');

test/policies/keyauth/keyauth.test.js

@@ -1,5 +1,4 @@
-const mock = require('mock-require');
-mock('redis', require('fakeredis'));
+
 const headerName = 'Authorization';
 
 const request = require('supertest');

test/policies/oauth/consumer-and-token-headers.test.js

@@ -1,5 +1,3 @@
-const mock = require('mock-require');
-mock('redis', require('fakeredis'));
 
 const session = require('supertest-session');
 const should = require('should');

test/policies/oauth/oauth-policy.test.js

@@ -1,5 +1,3 @@
-const mock = require('mock-require');
-mock('redis', require('fakeredis'));
 
 const session = require('supertest-session');
 const should = require('should');

test/policies/rate-limiter/rate-limit.by.host.test.js

@@ -1,5 +1,3 @@
-const mock = require('mock-require');
-mock('redis', require('fakeredis'));
 
 const testHelper = require('../../common/routing.helper');
 const config = require('../../../lib/config');

test/policies/rate-limiter/rate-limit.by.ip.test.js

@@ -1,5 +1,3 @@
-const mock = require('mock-require');
-mock('redis', require('fakeredis'));
 
 const testHelper = require('../../common/routing.helper');
 const config = require('../../../lib/config');

test/policies/rate-limiter/rate-limit.for.specific.host.js

@@ -1,5 +1,3 @@
-const mock = require('mock-require');
-mock('redis', require('fakeredis'));
 
 const testHelper = require('../../common/routing.helper');
 const config = require('../../../lib/config');

test/routing/multi-step-policy-execution.js

@@ -1,5 +1,3 @@
-const mock = require('mock-require');
-mock('redis', require('fakeredis'));
 
 const testHelper = require('../common/routing.helper');
 const sinon = require('sinon');
@@ -35,7 +33,7 @@ describe('default config with multi step (multi action) policy', () => {
       apiEndpoints: {
         test_default: {}
       },
-      policies: [ 'test', 'test-return' ],
+      policies: ['test', 'test-return'],
       pipelines: {
         pipeline1: {
           apiEndpoints: ['test_default'],
@@ -54,7 +52,7 @@ describe('default config with multi step (multi action) policy', () => {
         }
       }
     };
-    helper.setup({config, plugins});
+    helper.setup({ config, plugins });
   });
 
   after('cleanup', (done) => {

test/routing/path-general.test.js

@@ -1,5 +1,3 @@
-const mock = require('mock-require');
-mock('redis', require('fakeredis'));
 
 const testHelper = require('../common/routing.helper');
 const Config = require('../../lib/config/config');
@@ -23,15 +21,17 @@ describe('path resolution for specific and general domains', () => {
     describe('paths configuration without wildcards paths:/admin host:' + host, () => {
       const helper = testHelper();
       before('setup', () => {
-        const plugins = {policies: [{
-          name: 'routeTest',
-          policy: () => (req, res) => {
-            res.json({ result: 'test', hostname: req.hostname, url: req.url, apiEndpoint: req.egContext.apiEndpoint });
-          }
-        }]};
+        const plugins = {
+          policies: [{
+            name: 'routeTest',
+            policy: () => (req, res) => {
+              res.json({ result: 'test', hostname: req.hostname, url: req.url, apiEndpoint: req.egContext.apiEndpoint });
+            }
+          }]
+        };
         config.gatewayConfig = configTemplate;
         config.gatewayConfig.apiEndpoints.test.paths = '/admin';
-        helper.setup({config, plugins});
+        helper.setup({ config, plugins });
       });
 
       after('cleanup', (done) => {
@@ -65,15 +65,19 @@ describe('path resolution for specific and general domains', () => {
 
     describe('paths configuration with  /admin/*', () => {
       const helper = testHelper();
-      const plugins = {policies: [{name: 'routeTest',
-        policy: () => (req, res) => {
-          res.json({ result: 'test', hostname: req.hostname, url: req.url, apiEndpoint: req.egContext.apiEndpoint });
-        }}]};
+      const plugins = {
+        policies: [{
+          name: 'routeTest',
+          policy: () => (req, res) => {
+            res.json({ result: 'test', hostname: req.hostname, url: req.url, apiEndpoint: req.egContext.apiEndpoint });
+          }
+        }]
+      };
 
       before('setup', () => {
         config.gatewayConfig = configTemplate;
         config.gatewayConfig.apiEndpoints.test.paths = '/admin/*';
-        helper.setup({config, plugins});
+        helper.setup({ config, plugins });
       });
 
       after('cleanup', (done) => {
@@ -107,15 +111,19 @@ describe('path resolution for specific and general domains', () => {
 
     describe('paths with one named parameter /admin/:id', () => {
       const helper = testHelper();
-      const plugins = {policies: [{name: 'routeTest',
-        policy: () => (req, res) => {
-          res.json({ result: 'test', hostname: req.hostname, url: req.url, apiEndpoint: req.egContext.apiEndpoint });
-        }}]};
+      const plugins = {
+        policies: [{
+          name: 'routeTest',
+          policy: () => (req, res) => {
+            res.json({ result: 'test', hostname: req.hostname, url: req.url, apiEndpoint: req.egContext.apiEndpoint });
+          }
+        }]
+      };
 
       before('setup', () => {
         config.gatewayConfig = configTemplate;
         config.gatewayConfig.apiEndpoints.test.paths = '/admin/:id';
-        helper.setup({config, plugins});
+        helper.setup({ config, plugins });
       });
 
       after('cleanup', (done) => {
@@ -137,7 +145,7 @@ describe('path resolution for specific and general domains', () => {
         }));
       });
 
-      [ '/student', '/adm', '/admin', '/admin/', '/admin/1/rt' ].forEach(function (url) {
+      ['/student', '/adm', '/admin', '/admin/', '/admin/1/rt'].forEach(function (url) {
         it('should not serve  url: ' + url, helper.validate404({
           setup: {
             host,
@@ -149,15 +157,19 @@ describe('path resolution for specific and general domains', () => {
 
     describe('paths with one named parameter /admin/:group/:id', () => {
       const helper = testHelper();
-      const plugins = {policies: [{name: 'routeTest',
-        policy: () => (req, res) => {
-          res.json({ result: 'test', hostname: req.hostname, url: req.url, apiEndpoint: req.egContext.apiEndpoint });
-        }}]};
+      const plugins = {
+        policies: [{
+          name: 'routeTest',
+          policy: () => (req, res) => {
+            res.json({ result: 'test', hostname: req.hostname, url: req.url, apiEndpoint: req.egContext.apiEndpoint });
+          }
+        }]
+      };
 
       before('setup', () => {
         config.gatewayConfig = configTemplate;
         config.gatewayConfig.apiEndpoints.test.paths = '/admin/:group/:id';
-        helper.setup({config, plugins});
+        helper.setup({ config, plugins });
       });
 
       after('cleanup', (done) => {
@@ -191,15 +203,19 @@ describe('path resolution for specific and general domains', () => {
 
     describe('paths configuration with wildcard after slash or directory ["/admin","/admin/*"]', () => {
       const helper = testHelper();
-      const plugins = {policies: [{name: 'routeTest',
-        policy: () => (req, res) => {
-          res.json({ result: 'test', hostname: req.hostname, url: req.url, apiEndpoint: req.egContext.apiEndpoint });
-        }}]};
+      const plugins = {
+        policies: [{
+          name: 'routeTest',
+          policy: () => (req, res) => {
+            res.json({ result: 'test', hostname: req.hostname, url: req.url, apiEndpoint: req.egContext.apiEndpoint });
+          }
+        }]
+      };
 
       before('setup', () => {
         config.gatewayConfig = configTemplate;
         config.gatewayConfig.apiEndpoints.test.paths = ['/admin', '/admin/*'];
-        helper.setup({config, plugins});
+        helper.setup({ config, plugins });
       });
 
       after('cleanup', (done) => {

test/services/applications.test.js

@@ -1,5 +1,3 @@
-const mock = require('mock-require');
-mock('redis', require('fakeredis'));
 
 const should = require('should');
 const uuid = require('uuid');