Merge e4f9efad27 into deec84f3b5

lib/registry.js

@@ -273,7 +273,7 @@ Registry.prototype._defineRemoteMethods = function(ModelCtor, methods) {
 
     if (typeof meta.isStatic !== 'boolean') {
       key = isStatic ? key : m[1];
-      meta.isStatic = isStatic;
+      meta = Object.assign({}, meta, {isStatic});
     } else if (meta.isStatic && m) {
       throw new Error(g.f('Remoting metadata for %s.%s {{"isStatic"}} does ' +
       'not match new method name-based style.', ModelCtor.modelName, key));

test/fixtures/remote-methods/common/models/Foo.json

@@ -0,0 +1,7 @@
+{
+  "name": "Foo",
+  "base": "PersistedModel",
+  "methods": {
+    "staticMethod": {}
+  }
+}

test/fixtures/remote-methods/server/config.json

@@ -0,0 +1,10 @@
+{
+  "port": 3000,
+  "host": "127.0.0.1",
+  "remoting": {
+    "errorHandler": {
+      "debug": true,
+      "log": false
+    }
+  }
+}

test/fixtures/remote-methods/server/datasources.json

@@ -0,0 +1,6 @@
+{
+  "db": {
+    "name": "db",
+    "connector": "memory"
+  }
+}

test/fixtures/remote-methods/server/model-config.json

@@ -0,0 +1,39 @@
+{
+  "_meta": {
+    "sources": [
+      "loopback/common/models",
+      "loopback/server/models",
+      "../common/models",
+      "./models"
+    ],
+    "mixins": [
+      "loopback/common/mixins",
+      "loopback/server/mixins",
+      "../common/mixins",
+      "./mixins"
+    ]
+  },
+  "User": {
+    "dataSource": "db"
+  },
+  "AccessToken": {
+    "dataSource": "db",
+    "public": false
+  },
+  "ACL": {
+    "dataSource": "db",
+    "public": false
+  },
+  "RoleMapping": {
+    "dataSource": "db",
+    "public": false
+  },
+  "Role": {
+    "dataSource": "db",
+    "public": false
+  },
+  "Foo": {
+    "dataSource": "db",
+    "public": true
+  }
+}

test/fixtures/remote-methods/server/server.js

@@ -0,0 +1,12 @@
+// Copyright IBM Corp. 2015. All Rights Reserved.
+// Node module: loopback
+// This file is licensed under the MIT License.
+// License text available at https://opensource.org/licenses/MIT
+
+'use strict';
+var boot = require('loopback-boot');
+var loopback = require('../../../../index');
+
+var app = module.exports = loopback();
+boot(app, __dirname);
+app.use(loopback.rest());

test/model.test.js

@@ -14,6 +14,7 @@ var PersistedModel = loopback.PersistedModel;
 var Promise = require('bluebird');
 var TaskEmitter = require('strong-task-emitter');
 var request = require('supertest');
+var path = require('path');
 
 var expect = require('./helpers/expect');
 
@@ -1032,4 +1033,12 @@ describe.onServer('Remote Methods', function() {
         });
     }
   });
+
+  describe('Create Model with remote methods from JSON description', function() {
+    it('does not add isStatic properties to the method settings', function() {
+      var app = require(path.join(__dirname,
+        'fixtures/remote-methods/server/server.js'));
+      assert.deepEqual(app.models.Foo.settings.methods.staticMethod, {});
+    });
+  });
 });