Merge branch 'release/1.2.3'

CHANGELOG.md

@@ -1,3 +1,8 @@
+# 1.2.3 / 16-10-2018
+- Force latest dependencies
+- Push dependencies to peerDependencies
+- Improve integration test
+
 # 1.2.1 / 09-09-2018
 - force latest dependencies
 - run security audit fix

package.json

@@ -1,6 +1,6 @@
 {
  "name": "@codetanzania/majifix-service-group",
- "version": "1.2.2",
+ "version": "1.2.3",
  "description": "A representation of an entity that group services offered by a jurisdiction(s) into meaningful categories e.g Sanitation.",
  "main": "index.js",
  "scripts": {
@@ -43,32 +43,45 @@
  },
  "devDependencies": {
  "@benmaruchu/faker": "^4.2.1",
- "chai": "^4.1.2",
+ "@codetanzania/majifix-common": "^0.11.1",
+ "@codetanzania/majifix-jurisdiction": "^1.5.2",
+ "@codetanzania/majifix-priority": "^1.4.3",
+ "@lykmapipo/express-common": "^0.9.2",
+ "async": "^2.6.1",
+ "chai": "^4.2.0",
+ "express": "^4.16.4",
  "grunt": "^1.0.3",
  "grunt-apidoc": "^0.11.0",
  "grunt-contrib-jshint": "^2.0.0",
  "grunt-contrib-watch": "^1.1.0",
  "grunt-mocha-test": "^0.13.3",
  "jshint-stylish": "^2.2.1",
+ "lodash": "^4.17.11",
  "mocha": "^5.2.0",
- "mongoose": "^5.2.17",
+ "moment": "^2.22.2",
+ "mongoose": "^5.3.4",
+ "mongoose-geojson-schemas": "^0.8.1",
+ "mongoose-locale-schema": "^0.2.1",
+ "mongoose-rest-actions": "^0.18.2",
  "nodemon": "^1.18.4",
- "sinon": "^6.3.4",
+ "randomcolor": "^0.5.3",
+ "sinon": "^7.0.0",
  "sinon-chai": "^3.2.0",
  "sinon-mongoose": "^2.2.1",
  "supertest": "^3.3.0"
  },
- "dependencies": {
- "@codetanzania/majifix-common": "^0.9.2",
- "@codetanzania/majifix-jurisdiction": "^1.4.3",
- "@codetanzania/majifix-priority": "^1.4.2",
- "@lykmapipo/express-common": "^0.9.1",
+ "peerDependencies": {
+ "@codetanzania/majifix-common": "^0.11.1",
+ "@codetanzania/majifix-jurisdiction": "^1.5.2",
+ "@codetanzania/majifix-priority": "^1.4.3",
+ "@lykmapipo/express-common": "^0.9.2",
  "async": "^2.6.1",
- "express": "^4.16.3",
+ "express": "^4.16.4",
  "lodash": "^4.17.11",
  "moment": "^2.22.2",
- "mongoose-locale-schema": "^0.2.0",
- "mongoose-rest-actions": "^0.17.1",
+ "mongoose-geojson-schemas": "^0.8.1",
+ "mongoose-locale-schema": "^0.2.1",
+ "mongoose-rest-actions": "^0.18.2",
  "randomcolor": "^0.5.3"
  },
  "engines": {

test/integration/boostrap.spec.js

@@ -1,28 +1,34 @@
 'use strict';
 
 
+process.env.NODE_ENV = 'test';
+
+
 /* dependencies */
 const mongoose = require('mongoose');
+const MONGODB_URI = 'mongodb:https://localhost/majifix-service-group';
 
 
-function wipe(done) {
+/* clean and restore database */
+const wipe = (done) => {
  if (mongoose.connection && mongoose.connection.dropDatabase) {
  mongoose.connection.dropDatabase(done);
  } else {
  done();
  }
-}
+};
 
 
-//setup database
-before(function (done) {
- mongoose.connect('mongodb:https://localhost/majifix-service-group', done);
+/* setup database */
+before((done) => {
+ const options = { useNewUrlParser: true };
+ mongoose.connect(MONGODB_URI, options, done);
 });
 
 
-// clear database
+/* clear database */
 before(wipe);
 
 
-// clear database
+/* clear database */
 after(wipe);

test/integration/http.spec.js

@@ -16,7 +16,7 @@ describe('ServiceGroup', function () {
  describe('Rest API', function () {
 
  before(function (done) {
- ServiceGroup.remove(done);
+ ServiceGroup.deleteMany(done);
  });
 
  let servicegroup;
@@ -179,7 +179,7 @@ describe('ServiceGroup', function () {
 
 
  after(function (done) {
- ServiceGroup.remove(done);
+ ServiceGroup.deleteMany(done);
  });
 
  });

test/integration/servicegroup.delete.spec.js

@@ -13,11 +13,11 @@ describe('ServiceGroup', function () {
  let priority;
 
  before(function (done) {
- Priority.remove(done);
+ Priority.deleteMany(done);
  });
 
  before(function (done) {
- Jurisdiction.remove(done);
+ Jurisdiction.deleteMany(done);
  });
 
  before(function (done) {
@@ -38,7 +38,7 @@ describe('ServiceGroup', function () {
 
 
  before(function (done) {
- ServiceGroup.remove(done);
+ ServiceGroup.deleteMany(done);
  });
 
  describe('static delete', function () {
@@ -122,15 +122,15 @@ describe('ServiceGroup', function () {
  });
 
  after(function (done) {
- ServiceGroup.remove(done);
+ ServiceGroup.deleteMany(done);
  });
 
  after(function (done) {
- Priority.remove(done);
+ Priority.deleteMany(done);
  });
 
  after(function (done) {
- Jurisdiction.remove(done);
+ Jurisdiction.deleteMany(done);
  });
 
 });

test/integration/servicegroup.get.spec.js

@@ -13,7 +13,7 @@ describe('ServiceGroup', function () {
  let jurisdiction;
 
  before(function (done) {
- Jurisdiction.remove(done);
+ Jurisdiction.deleteMany(done);
  });
 
  before(function (done) {
@@ -25,7 +25,7 @@ describe('ServiceGroup', function () {
  });
 
  before(function (done) {
- ServiceGroup.remove(done);
+ ServiceGroup.deleteMany(done);
  });
 
  describe('get', function () {
@@ -158,11 +158,11 @@ describe('ServiceGroup', function () {
  });
 
  after(function (done) {
- ServiceGroup.remove(done);
+ ServiceGroup.deleteMany(done);
  });
 
  after(function (done) {
- Jurisdiction.remove(done);
+ Jurisdiction.deleteMany(done);
  });
 
-});
+});

test/integration/servicegroup.get_by_id.spec.js

@@ -12,7 +12,7 @@ describe('ServiceGroup', function () {
  let jurisdiction;
 
  before(function (done) {
- Jurisdiction.remove(done);
+ Jurisdiction.deleteMany(done);
  });
 
  before(function (done) {
@@ -25,7 +25,7 @@ describe('ServiceGroup', function () {
 
 
  before(function (done) {
- ServiceGroup.remove(done);
+ ServiceGroup.deleteMany(done);
  });
 
  describe('get by id', function () {
@@ -108,11 +108,11 @@ describe('ServiceGroup', function () {
  });
 
  after(function (done) {
- ServiceGroup.remove(done);
+ ServiceGroup.deleteMany(done);
  });
 
  after(function (done) {
- Jurisdiction.remove(done);
+ Jurisdiction.deleteMany(done);
  });
 
-});
+});

test/integration/servicegroup.patch.spec.js

@@ -11,7 +11,7 @@ describe('ServiceGroup', function () {
  let jurisdiction;
 
  before(function (done) {
- Jurisdiction.remove(done);
+ Jurisdiction.deleteMany(done);
  });
 
  before(function (done) {
@@ -23,7 +23,7 @@ describe('ServiceGroup', function () {
  });
 
  before(function (done) {
- ServiceGroup.remove(done);
+ ServiceGroup.deleteMany(done);
  });
 
  describe('static patch', function () {
@@ -117,11 +117,11 @@ describe('ServiceGroup', function () {
  });
 
  after(function (done) {
- ServiceGroup.remove(done);
+ ServiceGroup.deleteMany(done);
  });
 
  after(function (done) {
- Jurisdiction.remove(done);
+ Jurisdiction.deleteMany(done);
  });
 
-});
+});

test/integration/servicegroup.post.spec.js

@@ -11,7 +11,7 @@ describe('ServiceGroup', function () {
  let jurisdiction;
 
  before(function (done) {
- Jurisdiction.remove(done);
+ Jurisdiction.deleteMany(done);
  });
 
  before(function (done) {
@@ -23,7 +23,7 @@ describe('ServiceGroup', function () {
  });
 
  before(function (done) {
- ServiceGroup.remove(done);
+ ServiceGroup.deleteMany(done);
  });
 
  describe('static post', function () {
@@ -77,11 +77,11 @@ describe('ServiceGroup', function () {
  });
 
  after(function (done) {
- ServiceGroup.remove(done);
+ ServiceGroup.deleteMany(done);
  });
 
  after(function (done) {
- Jurisdiction.remove(done);
+ Jurisdiction.deleteMany(done);
  });
 
-});
+});

test/integration/servicegroup.put.spec.js

@@ -11,7 +11,7 @@ describe('ServiceGroup', function () {
  let jurisdiction;
 
  before(function (done) {
- Jurisdiction.remove(done);
+ Jurisdiction.deleteMany(done);
  });
 
  before(function (done) {
@@ -23,7 +23,7 @@ describe('ServiceGroup', function () {
  });
 
  before(function (done) {
- ServiceGroup.remove(done);
+ ServiceGroup.deleteMany(done);
  });
 
  describe('static put', function () {
@@ -117,11 +117,11 @@ describe('ServiceGroup', function () {
  });
 
  after(function (done) {
- ServiceGroup.remove(done);
+ ServiceGroup.deleteMany(done);
  });
 
  after(function (done) {
- Jurisdiction.remove(done);
+ Jurisdiction.deleteMany(done);
  });
 
-});
+});