github/meteor
1
1
Fork 0
mirror of https://github.com/meteor/meteor.git synced 2026-05-02 03:01:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

ObserveChanges stop sending empty changed() event in some cases

Browse Source
This commit is contained in:
Naomi Seyfer
2013-02-22 13:02:50 -08:00
parent d923e9e92b
commit e4bd63b397
2 changed files with 35 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/minimongo/minimongo.js
View File

@@ -585,8 +585,11 @@ LocalCollection._updateInResults = function (query, doc, old_doc) {
if (!EJSON.equals(doc._id, old_doc._id))
throw new Error("Can't change a doc's _id while updating");
if (!query.ordered) {
query.changed(doc._id, LocalCollection._makeChangedFields(doc, old_doc));
query.results[LocalCollection._idStringify(doc._id)] = doc;
var changedFields = LocalCollection._makeChangedFields(doc, old_doc);
if (!_.isEmpty(changedFields)) {
query.changed(doc._id, changedFields);
query.results[LocalCollection._idStringify(doc._id)] = doc;
}
return;
}

30
packages/mongo-livedata/observe_changes_tests.js
View File

@@ -91,6 +91,7 @@ Tinytest.addAsync("observeChanges - unordered - basics", function (test, onCompl
logger.expectResultOnly("added", [fooid, {noodles: "good", bacon: "bad", apples: "ok"}]);
c.update(fooid, {noodles: "alright", potatoes: "tasty", apples: "ok"});
c.update(fooid, {noodles: "alright", potatoes: "tasty", apples: "ok"});
logger.expectResultOnly("changed",
[fooid, {noodles: "alright", potatoes: "tasty", bacon: undefined}]);
@@ -107,6 +108,35 @@ Tinytest.addAsync("observeChanges - unordered - basics", function (test, onCompl
});
});
if (Meteor.isServer) {
Tinytest.addAsync("observeChanges - unordered - specific fields", function (test, onComplete) {
var c = makeCollection();
withCallbackLogger(test, ["added", "changed", "removed"], Meteor.isServer, function (logger) {
c.find({}, {fields:{noodles: 1, bacon: 1}}).observeChanges(logger);
var barid = c.insert({thing: "stuff"});
logger.expectResultOnly("added", [barid, {}]);
var fooid = c.insert({noodles: "good", bacon: "bad", apples: "ok"});
logger.expectResultOnly("added", [fooid, {noodles: "good", bacon: "bad"}]);
c.update(fooid, {noodles: "alright", potatoes: "tasty", apples: "ok"});
logger.expectResultOnly("changed",
[fooid, {noodles: "alright", bacon: undefined}]);
c.update(fooid, {noodles: "alright", potatoes: "meh", apples: "ok"});
c.remove(fooid);
logger.expectResultOnly("removed", [fooid]);
c.remove(barid);
logger.expectResultOnly("removed", [barid]);
fooid = c.insert({noodles: "good", bacon: "bad"});
logger.expectResult("added", [fooid, {noodles: "good", bacon: "bad"}]);
logger.expectNoResult();
onComplete();
});
});
}
Tinytest.addAsync("observeChanges - unordered - enters and exits result set through change", function (test, onComplete) {