From b4a5b6372f8ea55c452a87a13e7f00d0814cabb0 Mon Sep 17 00:00:00 2001 From: Petri Kivikangas Date: Tue, 28 Feb 2017 17:13:33 +0900 Subject: [PATCH 1/6] mongodb and mongoose should be peer dependencies --- package.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index f7bf717..a4839b3 100644 --- a/package.json +++ b/package.json @@ -10,10 +10,12 @@ "lodash": "^4.6.1" }, "devDependencies": { - "async": "^2.0.0-rc.1", + "async": "^2.0.0", "chai": "^3.5.0", "mocha": "^2.4.5", - "mockgoose": "^6.0.0", + "mockgoose": "^6.0.0" + }, + "peerDependencies": { "mongodb": "^2.1.11", "mongoose": "^4.4.9" }, From e43252fb86e5bc2c620cd7ccc9bd74b321bae417 Mon Sep 17 00:00:00 2001 From: Petri Kivikangas Date: Tue, 28 Feb 2017 17:59:19 +0900 Subject: [PATCH 2/6] Remove mongodb dependency as unnecessary (mongoose already depends on it), add mistakenly removed mongoose dependency back to devDependencies --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index a4839b3..a5aa895 100644 --- a/package.json +++ b/package.json @@ -13,10 +13,10 @@ "async": "^2.0.0", "chai": "^3.5.0", "mocha": "^2.4.5", - "mockgoose": "^6.0.0" + "mockgoose": "^6.0.0", + "mongoose": "^4.4.9" }, "peerDependencies": { - "mongodb": "^2.1.11", "mongoose": "^4.4.9" }, "scripts": { From 92d681abdc6489788495327e23130670da10906c Mon Sep 17 00:00:00 2001 From: Petri Kivikangas Date: Wed, 8 Mar 2017 14:10:19 +0900 Subject: [PATCH 3/6] Update deps --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index a5aa895..8b204f3 100644 --- a/package.json +++ b/package.json @@ -13,11 +13,11 @@ "async": "^2.0.0", "chai": "^3.5.0", "mocha": "^2.4.5", - "mockgoose": "^6.0.0", - "mongoose": "^4.4.9" + "mockgoose": "^7.0.0", + "mongoose": "^4.8.6" }, "peerDependencies": { - "mongoose": "^4.4.9" + "mongoose": "^4.8.6" }, "scripts": { "test": "mocha" From 32363c2a64cbefea7fa085823d1f45dc0deeceea Mon Sep 17 00:00:00 2001 From: Petri Kivikangas Date: Wed, 8 Mar 2017 14:12:25 +0900 Subject: [PATCH 4/6] Correct some deprecated syntax, set mongoose to use ES6 Promise in tests --- test/index.js | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/test/index.js b/test/index.js index 79dc88a..d4b8fe7 100644 --- a/test/index.js +++ b/test/index.js @@ -4,8 +4,9 @@ var swaggerMongoose = require('./../lib/index'); var fs = require('fs'); var async = require('async'); var mongoose = require('mongoose'); -var mockgoose = require('mockgoose'); -// mockgoose(mongoose); +mongoose.Promise = global.Promise; // Mongoose's default Promise is deprecated +var Mockgoose = require('mockgoose').Mockgoose; +var mockgoose = new Mockgoose(mongoose); var assert = require('chai').assert; var Schema = mongoose.Schema; var _ = require('lodash'); @@ -13,16 +14,15 @@ var _ = require('lodash'); describe('swagger-mongoose tests', function () { before(function(done) { - mockgoose(mongoose).then(function() { - mongoose.connect('mongodb://127.0.0.1:27017/TestingDB', function(err) { - done(err); - }); - }); - }); + mockgoose.prepareStorage().then(function() { + mongoose.connect('mongodb://127.0.0.1:27017/TestingDB', function(err) { + done(err); + }); + }); + }); afterEach(function (done) { - delete mongoose.models.Pet; delete mongoose.models.Address; delete mongoose.models.Error; @@ -30,10 +30,10 @@ describe('swagger-mongoose tests', function () { delete mongoose.models.House; delete mongoose.models.Car; delete mongoose.models.Human; - mockgoose.reset(function(){ - done() + mockgoose.helper.reset() + .then(function () { + done(); }); - }); it('should create an example pet and return all valid properties', function (done) { From 8107bd80b750683105ab034ddbeecb12fb42e827 Mon Sep 17 00:00:00 2001 From: Petri Kivikangas Date: Wed, 8 Mar 2017 23:58:46 +0900 Subject: [PATCH 5/6] Upgrade Node version in Travis to the most recent LTS (i.e. 6) --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1932865..4909f83 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,3 @@ language: node_js node_js: - - "0.11" + - "6" From 92cd927bed8abb8d7d81d93a902ff94fd09d6287 Mon Sep 17 00:00:00 2001 From: Petri Kivikangas Date: Thu, 9 Mar 2017 21:19:23 +0900 Subject: [PATCH 6/6] =?UTF-8?q?Increase=20Mocha=E2=80=99s=20timeout=20limi?= =?UTF-8?q?t=20because=20of=20Mocha=E2=80=99s=20slow=20initialization?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8b204f3..86088c8 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "mongoose": "^4.8.6" }, "scripts": { - "test": "mocha" + "test": "mocha --timeout 60000" }, "repository": { "type": "git",