getschema has to send original schema source, not the actual schema i…

…nstance

and some codestyle

mr-rpc-methods.js

@@ -289,7 +289,7 @@ var expose = function (model, schema, opts) {
      * @returns {Object} model's schema
      */
     getSchema: function () {
-      return mss.stringify(schema)
+      return mss.stringify(model.moonridgeSchema)
     }
   }
 

package.json

@@ -43,7 +43,7 @@
     "express": "^4.13",
     "lodash": "^3.10",
     "mongoose": "^4.3.7",
-    "mongoose-schema-serializer": "^1.0.0",
+    "mongoose-schema-serializer": "^1.0.1",
     "socket.io-rpc": "^1.1.0"
   },
   "devDependencies": {

test/basic-CRUD.spec.js

@@ -27,6 +27,18 @@ describe('basic CRUD including working liveQueries', function () {
   })
 
   it('should have a method getSchema for getting a schema of the model', function () {
+    return fighterModel.getSchema().then(schema => {
+      schema.should.eql({
+        name: {type: String, required: true},
+        health: Number,
+        born: Date,
+        death: {type: Date, permissions: {R: 4, W: 20}},
+        owner: {
+          ref: 'user',
+          type: 'ObjectId'
+        }
+      })
+    })
   })
 
   describe('rerun liveQueries', function () {

test/e2e-smoketest/db-init.js

@@ -2,11 +2,9 @@ var mongoose = require('mongoose')
 process.on('unhandledRejection', function (error, promise) {
   console.error('UNHANDLED REJECTION', error)
 })
-module.exports = function(MR) {
-
+module.exports = function (MR) {
   var location = MR.model('location', {loc: {type: [Number], index: '2dsphere'}}, {
-    schemaInit: function(schema) {
-
+    schemaInit: function (schema) {
     }
   })	// for testing near queries
   var fighter = MR.model('fighter', {
@@ -36,7 +34,7 @@ module.exports = function(MR) {
   })
 
   fighter.schema.on('preupdate', function (doc, previousDocVersion) {
-    console.log("fighter preupdate callback triggered, is modified ", doc.isModified()) // a good place to put custom save logic
+    console.log('fighter preupdate callback triggered, is modified ', doc.isModified()) // a good place to put custom save logic
     console.log('doc', doc)
     console.log('previousDocVersion', previousDocVersion)
   })
@@ -48,7 +46,7 @@ module.exports = function(MR) {
   }, {ownerRequired: false})
 
   battleM.schema.on('update', function (doc, previousDocVersion) {
-    console.log("battle update callback triggered, is modified ", doc.isModified()) // a good place to put custom save logic
+    console.log('battle update callback triggered, is modified ', doc.isModified()) // a good place to put custom save logic
     console.log(doc)
     console.log(previousDocVersion)
   })
@@ -68,20 +66,18 @@ module.exports = function(MR) {
   //
   // 	})
 
-
   return Promise.all([].concat([
     user.create({
       name: 'admin', privilege_level: 50
-    }).then(function() {
-      console.log("admin created")
+    }).then(function () {
+      console.log('admin created')
     }),
     user.create({
       name: 'testUser', privilege_level: 10
-    }).then(function() {
-      console.log("testUser created")
+    }).then(function () {
+      console.log('testUser created')
     })
-  ])).then(function() {
-    console.log("all collections should be clean, users created")
-
+  ])).then(function () {
+    console.log('all collections should be clean, users created')
   })
 }