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 branch 'release/2.5.2' into production

This commit is contained in:
Raymond Feng 2014-08-21 13:51:00 -07:00
parent f6ef201ec8 9e25cf1cd3
commit dbc03178c0
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/model.js
View File

@ -151,7 +151,8 @@ ModelBaseClass.prototype._initProperties = function (data, options) {
} else {
// Un-managed property
if (strict === false || self.__cachedRelations[p]) {
self[p] = self.__data[p] = propVal || self.__cachedRelations[p];
self[p] = self.__data[p] =
(propVal !== undefined) ? propVal : self.__cachedRelations[p];
} else if (strict === 'throw') {
throw new Error('Unknown property: ' + p);
}

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "loopback-datasource-juggler",
"version": "2.5.1",
"version": "2.5.2",
"description": "LoopBack DataSoure Juggler",
"keywords": [
"StrongLoop",

3
test/loopback-dl.test.js
View File

@ -28,12 +28,13 @@ describe('ModelBuilder define model', function () {
modelBuilder.models.should.be.a('object').and.have.property('User', User);
modelBuilder.definitions.should.be.a('object').and.have.property('User');
var user = new User({name: 'Joe', age: 20});
var user = new User({name: 'Joe', age: 20, xyz: false});
User.modelName.should.equal('User');
user.should.be.a('object').and.have.property('name', 'Joe');
user.should.have.property('name', 'Joe');
user.should.have.property('age', 20);
user.should.have.property('xyz', false);
user.should.not.have.property('bio');
done(null, User);
});