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

package.json

@@ -44,7 +44,7 @@
     }
   },
   "scripts": {
-    "cover": "istanbul cover _mocha \"./test/**/!(index).js\" -- --exit",
+    "cover": "istanbul --include-all-sources cover _mocha \"./test/**/!(index).js\" -- --exit",
     "coveralls": "npm run cover -- --report lcovonly && cat ./coverage/lcov.info | coveralls",
     "depcheck": "depcheck --ignores=path,mocha-lcov-reporter",
     "lint": "./node_modules/eslint/bin/eslint.js --cache lib/** test/**",

test/config/index.js

@@ -10,7 +10,11 @@ module.exports = {
         version: '1.0.0',
         description: 'API de test manuel du service docs !',
         base_url: 'http://localhost:3000',
-        mongoURI: 'mongodb://localhost:27017/relationships',
+        mongo: {
+            host: 'localhost',
+            port: 27017,
+            name: 'relatioships'
+        },
         license: {
             name: 'MIT',
             url: 'https://opensource.org/licenses/mit-license.php'

test/config/test.js

@@ -10,7 +10,11 @@ module.exports = {
         version: '1.0.0',
         description: 'API de test avec les pizzas Arezzo !',
         base_url: 'http://localhost:3000',
-        mongoURI: 'mongodb://localhost:27017/relationships',
+        mongo: {
+            host: 'localhost',
+            port: 27017,
+            name: 'relationships'
+        },
         license: {
             name: 'MIT',
             url: 'https://opensource.org/licenses/mit-license.php'

test/docs-owner.js

@@ -3,7 +3,7 @@ process.env.NODE_CONFIG_DIR = './test/config';
 process.env.NODE_ENV = 'test';
 
 //Require the dev-dependencies
-const {MongoClient} = require('mongodb');
+const {MongoClient, Server} = require('mongodb');
 const debug = require('debug')('campsi:test');
 const chai = require('chai');
 const chaiHttp = require('chai-http');
@@ -56,9 +56,11 @@ describe('Docs - Owner', () => {
     beforeEach((done) => {
 
         // Empty the database
-        MongoClient.connect(config.campsi.mongoURI).then((db) => {
+        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);
             db.dropDatabase(() => {
-                db.close();
+                client.close();
                 campsi = new CampsiServer(config.campsi);
                 campsi.mount('docs', new services.Docs(config.services.docs));
                 campsi.app.use((req, res, next) => {

test/docs.js

@@ -3,7 +3,7 @@ process.env.NODE_CONFIG_DIR = './test/config';
 process.env.NODE_ENV = 'test';
 
 //Require the dev-dependencies
-const {MongoClient} = require('mongodb');
+const {MongoClient, Server} = require('mongodb');
 const debug = require('debug')('campsi:test');
 const async = require('async');
 const chai = require('chai');
@@ -47,9 +47,11 @@ describe('Docs', () => {
     beforeEach((done) => {
 
         // Empty the database
-        MongoClient.connect(config.campsi.mongoURI).then((db) => {
+        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);
             db.dropDatabase(() => {
-                db.close();
+                client.close();
                 campsi = new CampsiServer(config.campsi);
                 campsi.mount('docs', new services.Docs(config.services.docs));