verdnatura-mirror
/
loopback-datasource-juggler
mirror of https://github.com/loopbackio/loopback-datasource-juggler
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #227 from fabien/fix/definition-tojson 

Fix ModelDefinition toJSON bug
This commit is contained in:
Raymond Feng 2014-08-17 22:17:05 -07:00
parent c3c2907248 291e7b2c74
commit 38431753a1
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/model-definition.js
View File

@ -265,7 +265,7 @@ ModelDefinition.prototype.toJSON = function (forceRebuild) {
this.json = null; this.json = null;
} }
if (this.json) { if (this.json) {
return json; return this.json;
} }
var json = { var json = {
name: this.name, name: this.name,

4
test/model-definition.test.js
View File

@ -36,7 +36,9 @@ describe('ModelDefinition class', function () {
assert.equal(json.properties.approved.type, "Boolean"); assert.equal(json.properties.approved.type, "Boolean");
assert.equal(json.properties.joinedAt.type, "Date"); assert.equal(json.properties.joinedAt.type, "Date");
assert.equal(json.properties.age.type, "Number"); assert.equal(json.properties.age.type, "Number");
assert.deepEqual(User.toJSON(), json);
done(); done();
}); });