Trying to improve mongodb cleanup so circleci closes

Author: andrewshell

.mocharc.js

@@ -0,0 +1,8 @@
+'use strict';
+
+module.exports = {
+    'reporter': 'mocha-multi',
+    'reporter-option': ['spec=-,xunit=xunit/test-results.xml'],
+    'require': './test/fixtures.js',
+    'timeout': '10000',
+};

docker-compose.yml

@@ -6,8 +6,6 @@ services:
     image: mongo
     expose:
       - 27017
-    logging:
-      driver: "none"
 
   rsscloud:
     build: .
@@ -21,8 +19,6 @@ services:
       - 5337
     depends_on:
       - mongodb
-    logging:
-      driver: "none"
 
   rsscloud-tests:
     build: .

package.json

@@ -9,7 +9,7 @@
     "import-data": "node ./bin/import-data.js",
     "jshint": "jshint ./**/*.js",
     "eslint": "eslint --fix controllers/ services/ test/",
-    "test": "mocha -R mocha-multi --reporter-options spec=-,xunit=xunit/test-results.xml --timeout 10000",
+    "test": "mocha",
     "test-api": "docker-compose up --build --abort-on-container-exit"
   },
   "engines": {

services/mongodb.js

@@ -4,30 +4,51 @@
     const { MongoClient } = require('mongodb'),
         state = {};
 
-    module.exports = {
-        connect: async function (name, uri) {
-            if (state[name]) {
-                return;
-            }
-
-            const client = await MongoClient.connect(uri, { useUnifiedTopology: true });
-
-            state[name] = client;
-
-            // console.log(`${name} Database Connected`);
-
-            return state[name].db();
-        },
-        get: function (name) {
-            return state[name].db();
-        },
-        close: async function (name) {
-            if (state[name]) {
-                return state[name].close()
-                    .then(() => {
-                        delete state[name];
-                    });
-            }
+    async function connect(name, uri) {
+        if (state[name]) {
+            return;
         }
+
+        const client = await MongoClient.connect(uri, { useUnifiedTopology: true });
+
+        state[name] = client;
+
+        // console.log(`${name} Database Connected`);
+
+        return state[name].db();
+    }
+
+    function get(name) {
+        return state[name].db();
+    }
+
+    async function close(name) {
+        if (state[name]) {
+            return state[name].close()
+                .finally(() => {
+                    delete state[name];
+                });
+        }
+    }
+
+    async function closeAll() {
+        await Promise.all(Object.keys(state).map(name => close));
+    }
+
+    function cleanup() {
+        closeAll()
+            .finally(() => {
+                process.exit();
+            });
+    }
+
+    process.on('SIGINT', cleanup);
+    process.on('SIGTERM', cleanup);
+
+    module.exports = {
+        connect,
+        get,
+        close,
+        closeAll
     };
 }());

test/fixtures.js

@@ -0,0 +1,9 @@
+const mongodb = require("./mongodb");
+
+exports.mochaGlobalSetup = async function () {
+    await mongodb.before();
+};
+
+exports.mochaGlobalTeardown = async function () {
+    await mongodb.after();
+};

test/mongodb.js

@@ -26,10 +26,11 @@ async function upsertSubscriptions(subscriptions) {
 module.exports = {
     addSubscription: async function (resourceUrl, notifyProcedure, apiurl, protocol) {
         const subscriptions = await fetchSubscriptions(resourceUrl);
+
         initSubscription(subscriptions, notifyProcedure, apiurl, protocol);
         await upsertSubscriptions(subscriptions);
 
-        const index = subscriptions.pleaseNotify.findIndex(subscription => {
+        let index = subscriptions.pleaseNotify.findIndex(subscription => {
             return subscription.url === apiurl;
         });
 
@@ -40,25 +41,22 @@ module.exports = {
         throw Error(`Cannot find ${apiurl} subscription`);
     },
     updateSubscription: async function (resourceUrl, subscription) {
-        const subscriptions = await fetchSubscriptions(resourceUrl);
-        const index = subscriptions.pleaseNotify.findIndex(match => {
-            return subscription.url === match.url;
-        });
+        const subscriptions = await fetchSubscriptions(resourceUrl),
+            index = subscriptions.pleaseNotify.findIndex(match => {
+                return subscription.url === match.url;
+            });
 
         if (-1 !== index) {
             subscriptions.pleaseNotify[index] = subscription;
             await upsertSubscriptions(subscriptions);
             return subscriptions.pleaseNotify[index];
         }
 
-        throw Error(`Cannot find ${apiurl} subscription`);
+        throw Error(`Cannot find ${subscription.url} subscription`);
     },
     before: async function () {
-        const db = await mongodb.connect('rsscloud', config.mongodbUri);
-
+        await mongodb.connect('rsscloud', config.mongodbUri);
         console.log(`    → MongoDB 'rsscloud' Database Connected`);
-
-        return db;
     },
     after: async function () {
         return mongodb.close('rsscloud');

test/ping.js

@@ -57,12 +57,10 @@ for (const pingProtocol of ['XML-RPC', 'REST']) {
 
     describe(`Ping ${pingProtocol} to ${protocol} returning ${returnFormat}`, function () {
         before(async function () {
-            await mongodb.before();
             await mock.before();
         });
 
         after(async function () {
-            await mongodb.after();
             await mock.after();
         });