Merge pull request 3.0.1

3.0.1: fixed Mongoose singleton being defered
juampi92 · Apr 24, 2018 · 1c60524 · 1c60524
2 parents 31b960a + c1603cb
commit 1c60524
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 12 deletions.
diff --git a/instructions.md b/instructions.md
@@ -8,13 +8,6 @@ const providers = [
 ]
 ```
 
-And create an Alias for Mongoose
-
-```js
-const aliases = {
-  Mongoose: 'Adonis/Addons/Mongoose'
-}
-```
 ## Config mongodb connection
 
 Finally add the database config inside `config/database.js` file.

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "adonis-mongoose-model",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "description": "Mongoose models for Adonis framework",
   "main": "index.js",
   "repository": "[email protected]:juampi92/adonis-mongoose-model.git",

diff --git a/providers/MongooseProvider.js b/providers/MongooseProvider.js
@@ -23,7 +23,7 @@ class MongooseProvider extends ServiceProvider {
       'serializer')
   }
 
-  async _registerMongoose () {
+  _registerMongoose () {
     this.app.singleton('Adonis/Addons/Mongoose', function (app) {
       const Config = app.use('Adonis/Src/Config')
       let connectionString = Config.get('database.mongodb.connectionString', null)
@@ -85,7 +85,7 @@ class MongooseProvider extends ServiceProvider {
     this._registerSerializer()
     this._registerModel()
     this._registerCommands()
-    await this._registerMongoose()
+    this._registerMongoose()
   }
 
   /**

diff --git a/src/Model/Base.js b/src/Model/Base.js
@@ -3,7 +3,7 @@
 
 require('@adonisjs/fold')
 
-const mongoose = use('mongoose')
+const mongoose = use('Adonis/Addons/Mongoose')
 const { Schema } = mongoose
 
 const utils = require('../utils')

diff --git a/test/ioc.spec.js b/test/ioc.spec.js
@@ -6,7 +6,8 @@ const ServiceProvider = require('../providers/MongooseProvider')
 
 test.group('IoC', function () {
   // Setup
-  ioc.fake('Mongoose', () => require('mongoose'))
+  ioc.fake('Adonis/Addons/Mongoose', () => require('mongoose'))
+  ioc.fake('Mongoose', () => ioc.use('Adonis/Addons/Mongoose'))
 
   const BaseModel = require('../src/Model/Base')