Merge remote-tracking branch 'origin/greenkeeper/initial'

package.json

@@ -14,8 +14,8 @@
     "string-format": "^0.5.0"
   },
   "devDependencies": {
-    "campsi": "git://github.com/campsi/campsi.git",
-    "campsi-service-trace": "git://github.com/campsi/campsi-service-trace.git",
+    "campsi": "^1.0.2",
+    "campsi-service-trace": "^1.0.1",
     "chai": "^4.1.2",
     "chai-http": "^3.0.0",
     "config": "^1.28.0",
@@ -25,7 +25,8 @@
     "eslint-plugin-indexof": "^0.1.1",
     "istanbul": "^0.4.5",
     "mocha": "^4.1.0",
-    "mocha-lcov-reporter": "^1.3.0"
+    "mocha-lcov-reporter": "^1.3.0",
+    "mongo-uri-builder": "^1.0.3"
   },
   "altDependencies": {
     "dev": {

test/config/test.js

@@ -8,7 +8,7 @@ module.exports = {
         mongo: {
             'host': 'localhost',
             'port': 27017,
-            'name': 'relationships'
+            'database': 'relationships'
         }
     },
     services: {

test/webhooks.js

@@ -1,7 +1,8 @@
 process.env.NODE_CONFIG_DIR = './test/config';
 process.env.NODE_ENV = 'test';
 
-const {MongoClient, Server} = require('mongodb');
+const { MongoClient } = require('mongodb');
+const mongoUriBuilder = require('mongo-uri-builder');
 const debug = require('debug')('campsi:test');
 const chai = require('chai');
 const chaiHttp = require('chai-http');
@@ -21,11 +22,9 @@ const services = {
 
 describe('Assets API', () => {
     beforeEach((done) => {
-
-        // Empty the database
-        let client = new MongoClient(new Server(config.campsi.mongo.host, config.campsi.mongo.port));
-        client.connect((error, mongoClient) => {
-            let db = mongoClient.db(config.campsi.mongo.name);
+        const mongoUri = mongoUriBuilder(config.campsi.mongo);
+        MongoClient.connect(mongoUri, (err, client) => {
+            let db = client.db(config.campsi.mongo.database);
             db.dropDatabase(() => {
                 client.close();
                 campsi = new CampsiServer(config.campsi);