Skip to content

used on boolean field change callback not triggered when update to false #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Jcbobo wants to merge 3 commits into
base: master
Choose a base branch
from
Open

used on boolean field change callback not triggered when update to false #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
154be3b
add newVals[key] !== undefined instead newVals[key] for handle boolea…
May 17, 2017
40d9a06
add test also for false to true transition
May 17, 2017
12fadfd
changed callback not triggered if the value remain false
Jul 26, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/changed.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,11 +394,11 @@ module.exports = function(Model, options) {
_.forEach(properties, function(key) {
debug('getChangedProperties: - checking property %s ', key);

if (newVals[key]) {
if (newVals[key] !== undefined) {
var newVal = newVals[key];
debug('getChangedProperties: - new value %s ', newVal);

if (!oldVals[key] || !_.isEqual(oldVals[key], newVal)) {
if (oldVals[key] === undefined || !_.isEqual(oldVals[key], newVal)) {
debug('getChangedProperties: - changed or new value: %s itemId: %s', newVal, itemId);

changedProperties[itemId][key] = newVal;
Expand Down
8 changes: 8 additions & 0 deletions test/fixtures/simple-app/common/models/person.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,14 @@ module.exports = function(Person) {
});
return cb.promise;
};
Person.changeFlag = function(args, cb) {
cb = cb || utils.createPromiseCallback();
debug('this.changeFlag() called with %o', args);
process.nextTick(function() {
cb(null);
});
return cb.promise;
};

// Define a function that should be called when a change is detected.
Person.changeAge = function(args, cb) {
Expand Down
6 changes: 4 additions & 2 deletions test/fixtures/simple-app/common/models/person.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
"name": "String",
"nickname": "String",
"age": "Number",
"status": "String"
"status": "String",
"flag": "boolean"
},
"validations": [],
"relations": {},
Expand All @@ -20,7 +21,8 @@
"name": "changeName",
"nickname": "changeName",
"age": "changeAge",
"status": "changeStatus"
"status": "changeStatus",
"flag": "changeFlag"
}
}
}
Expand Down
42 changes: 38 additions & 4 deletions test/test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,24 +38,26 @@ describe('loopback datasource changed property', function() {
this.spyAge = this.sinon.spy(app.models.Person, 'changeAge');
this.spyStatus = this.sinon.spy(app.models.Person, 'changeStatus');
this.spyName = this.sinon.spy(app.models.Person, 'changeName');
this.spyFlag = this.sinon.spy(app.models.Person, 'changeFlag');
});

lt.beforeEach.withApp(app);

describe('when called internally', function() {
lt.beforeEach.givenModel('Person',
{title: 'Mr', name:'Joe Blogs', nickname: 'joe', age: 21, status: 'active'}, 'joe');
{title: 'Mr', name:'Joe Blogs', nickname: 'joe', age: 21, status: 'active', flag: true}, 'joe');
lt.beforeEach.givenModel('Person',
{title: 'Mr', name:'Bilbo Baggins', nickname: 'bilbo', age: 99, status: 'active'}, 'bilbo');
{title: 'Mr', name:'Bilbo Baggins', nickname: 'bilbo', age: 99, status: 'active', flag: true}, 'bilbo');
lt.beforeEach.givenModel('Person',
{title: 'Miss', name:'Tina Turner', nickname: 'tina', age: 80, status: 'pending'}, 'tina');
{title: 'Miss', name:'Tina Turner', nickname: 'tina', age: 80, status: 'pending', flag: false}, 'tina');

describe('Model.create', function() {
it('should not run callback when creating new instances.', function(done) {
var self = this;
expect(self.spyAge).not.to.have.been.called;
expect(self.spyAge).not.to.have.been.called;
expect(self.spyStatus).not.to.have.been.called;
expect(self.spyName).not.to.have.been.called;
expect(self.spyFlag).not.to.have.been.called;
done();
});
});
Expand All @@ -68,6 +70,7 @@ describe('loopback datasource changed property', function() {
expect(self.spyAge).not.to.have.been.called;
expect(self.spyStatus).not.to.have.been.called;
expect(self.spyName).not.to.have.been.called;
expect(self.spyFlag).not.to.have.been.called;
done();
})
.catch(done);
Expand All @@ -80,6 +83,7 @@ describe('loopback datasource changed property', function() {
expect(self.spyAge).not.to.have.been.called;
expect(self.spyStatus).not.to.have.been.called;
expect(self.spyName).not.to.have.been.called;
expect(self.spyFlag).not.to.have.been.called;
done();
})
.catch(done);
Expand All @@ -92,6 +96,7 @@ describe('loopback datasource changed property', function() {
expect(self.spyAge).not.to.have.been.called;
expect(self.spyStatus).not.to.have.been.called;
expect(self.spyName).not.to.have.been.called;
expect(self.spyFlag).not.to.have.been.called;
done();
})
.catch(done);
Expand All @@ -105,10 +110,38 @@ describe('loopback datasource changed property', function() {
expect(self.spyAge).to.have.been.called;
expect(self.spyStatus).not.to.have.been.called;
expect(self.spyName).not.to.have.been.called;
expect(self.spyFlag).not.to.have.been.called;
done();
})
.catch(done);
});

it('should run the callback after updating a watched property', function(done) {
var self = this;
this.joe.updateAttribute('flag', false)
.then(function(res) {
expect(res.flag).to.equal(false);
expect(self.spyAge).not.to.have.been.called;
expect(self.spyStatus).not.to.have.been.called;
expect(self.spyName).not.to.have.been.called;
expect(self.spyFlag).to.have.been.called;
done();
})
.catch(done);
});
it('should run the callback after updating a watched property', function(done) {
var self = this;
this.tina.updateAttribute('flag', true)
.then(function(res) {
expect(res.flag).to.equal(true);
expect(self.spyAge).not.to.have.been.called;
expect(self.spyStatus).not.to.have.been.called;
expect(self.spyName).not.to.have.been.called;
expect(self.spyFlag).to.have.been.called;
done();
})
.catch(done);
});
});

describe('Model.updateAttributes', function() {
Expand All @@ -119,6 +152,7 @@ describe('loopback datasource changed property', function() {
expect(self.spyAge).not.to.have.been.called;
expect(self.spyStatus).not.to.have.been.called;
expect(self.spyName).not.to.have.been.called;
expect(self.spyFlag).not.to.have.been.called;
done();
})
.catch(done);
Expand Down