test: Use memory adapter in micro-analytics-cli tests

Author: relekang

packages/micro-analytics-cli/package.json

@@ -44,7 +44,7 @@
     "babel-jest": "^19.0.0",
     "babel-polyfill": "^6.20.0",
     "babel-runtime": "^6.23.0",
-    "micro-analytics-adapter-memory": "^0.1.0",
+    "micro-analytics-adapter-memory": "^1.0.0",
     "nodemon": "^1.11.0",
     "request-promise": "^4.1.1"
   }

packages/micro-analytics-cli/src/db.js

@@ -12,6 +12,7 @@ function initDbAdapter(options) {
   module.exports.has = adapter.has;
   module.exports.keys = adapter.keys;
   module.exports.subscribe = adapter.subscribe;
+  module.exports.clear = adapter.clear;
   module.exports.hasFeature = feature => typeof adapter[feature] === 'function';
 
   if (module.exports.hasFeature('init')) {

packages/micro-analytics-cli/tests/atomicity.test.js

@@ -1,23 +1,17 @@
 const request = require('request-promise');
-const { listen, mockDb } = require('./utils');
+const { listen } = require('./utils');
 
-jest.mock('flat-file-db', () => mockDb);
 const db = require('../src/db');
 const service = require('../src/handler');
 let url;
 
 beforeAll(() => {
-  db.initDbAdapter({ adapter: 'flat-file-db' });
+  db.initDbAdapter({ adapter: 'memory' });
 });
 
 beforeEach(async () => {
-  url = await listen(service({ adapter: 'flat-file-db' }));
-  mockDb._setDelay(10);
-});
-
-afterEach(async () => {
-  mockDb._reset();
-  mockDb._setDelay();
+  url = await listen(service({ adapter: 'memory' }));
+  db.clear();
 });
 
 it('should atomically set two views coming in at the same time', async () => {

packages/micro-analytics-cli/tests/errors.test.js

@@ -6,11 +6,11 @@ const db = require('../src/db');
 let url;
 
 beforeAll(() => {
-  db.initDbAdapter({ adapter: 'flat-file-db' });
+  db.initDbAdapter({ adapter: 'memory' });
 });
 
 beforeEach(async () => {
-  url = await listen(service({ adapter: 'flat-file-db' }));
+  url = await listen(service({ adapter: 'memory' }));
 });
 
 it('should throw an error if no pathname is provided', async () => {

packages/micro-analytics-cli/tests/items.test.js

@@ -1,18 +1,17 @@
 const request = require('request-promise');
-const { listen, mockDb } = require('./utils');
+const { listen } = require('./utils');
 
-jest.mock('flat-file-db', () => mockDb);
 const db = require('../src/db');
 const service = require('../src/handler');
 let url;
 
 beforeAll(() => {
-  db.initDbAdapter({ adapter: 'flat-file-db' });
+  db.initDbAdapter({ adapter: 'memory' });
 });
 
 beforeEach(async () => {
-  mockDb._reset();
-  url = await listen(service({ adapter: 'flat-file-db' }));
+  db.clear();
+  url = await listen(service({ adapter: 'memory' }));
 });
 
 describe('single', () => {
@@ -100,7 +99,7 @@ describe('all', () => {
       const after = new Date('2017-01-01T09:11:00.000Z').getTime();
       const before = new Date('2017-01-01T09:41:00.000Z').getTime();
 
-      mockDb._put('/rover', {
+      await db.put('/rover', {
         views: [
           { time: new Date('2017-01-01T09:00:00.000Z').getTime() },
           { time: new Date('2017-01-01T09:10:00.000Z').getTime() },

packages/micro-analytics-cli/tests/sse.test.js

@@ -1,15 +1,14 @@
-const { listen, mockDb } = require('./utils');
-jest.mock('flat-file-db', () => mockDb);
+const { listen } = require('./utils');
 const db = require('../src/db');
 const sseHandler = require('../src/sse');
 let url;
 
 beforeAll(() => {
-  db.initDbAdapter({ adapter: 'flat-file-db' });
+  db.initDbAdapter({ adapter: 'memory' });
 });
 
 beforeEach(() => {
-  mockDb._reset();
+  db.clear();
 });
 
 describe('sse', () => {

packages/micro-analytics-cli/tests/utils.js

@@ -1,46 +1,6 @@
 const micro = require('micro');
 const noop = () => {};
 
-// Mock the database
-const DB = () => {
-  let data = {};
-  let DELAY = 1;
-
-  return {
-    sync: () => ({
-      get: key => {
-        if (!{}.hasOwnProperty.call(data, key)) {
-          throw new Error('non-existing-key');
-        }
-        return data[key];
-      },
-      put: (key, val, cb) => {
-        setTimeout(() => {
-          data[key] = val;
-          cb();
-        }, DELAY);
-      },
-      has: key => ({}.hasOwnProperty.call(data, key)),
-      keys: () => Object.keys(data),
-      del: noop,
-      clear: noop,
-      close: noop,
-      on: noop,
-    }),
-
-    // Custom methods used in tests
-    _reset: () => {
-      data = {};
-    },
-    _setDelay: ms => {
-      DELAY = ms || 1;
-    },
-    _put: (key, value) => {
-      data[key] = value;
-    },
-  };
-};
-
 // Taken from the zeit/micro test suite
 // https://github.com/zeit/micro/blob/9bb0f0cb9b9406e08b3bccbcd827d96989b4e16a/test/index.js#L13-L26
 const listen = (fn, opts) => {
@@ -60,4 +20,3 @@ const listen = (fn, opts) => {
 
 module.exports = exports = {};
 exports.listen = listen;
-exports.mockDb = DB();