IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-16 18:24:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Suggested Topics were sometimes disappearing

Browse Source
This commit is contained in:
Robin Ward 2013-07-18 16:09:03 -04:00
parent 419cbc7701
commit 7d4b089cd1
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/models/post_stream.js
View File

@ -85,7 +85,7 @@ Discourse.PostStream = Em.Object.extend({
lastPostLoaded: function() {
if (!this.get('hasLoadedData')) { return false; }
return !!this.get('posts').findProperty('id', this.get('lastPostId'));
}.property('hasLoadedData', 'posts.[]', 'lastPostId'),
}.property('hasLoadedData', 'posts.@each.id', 'lastPostId'),
lastPostNotLoaded: Em.computed.not('lastPostLoaded'),

20
test/javascripts/models/post_stream_test.js
View File

@ -293,6 +293,7 @@ test("staging and committing a post", function() {
// Stage the new post in the stream
var result = postStream.stagePost(stagedPost, user);
equal(result, true, "it returns true");
ok(postStream.get('loading'), "it is loading while the post is being staged");
stagedPost.setProperties({ id: 1234, raw: "different raw value" });
equal(postStream.get('filteredPostsCount'), 1, "it retains the filteredPostsCount");
@ -341,6 +342,22 @@ test('triggerNewPostInStream', function() {
});
test("lastPostLoaded when the id changes", function() {
// This can happen in a race condition between staging a post and it coming through on the
// message bus. If the id of a post changes we should reconsider the lastPostLoaded property.
var postStream = buildStream(10101, [1, 2]);
var postWithoutId = Discourse.Post.create({ raw: 'hello world this is my new post' });
postStream.appendPost(Discourse.Post.create({id: 1, post_number: 1}));
postStream.appendPost(postWithoutId);
ok(!postStream.get('lastPostLoaded'), 'the last post is not loaded');
postWithoutId.set('id', 2);
ok(postStream.get('lastPostLoaded'), 'the last post is loaded now that the post has an id');
});
test("comitting and triggerNewPostInStream race condition", function() {
var postStream = buildStream(4964);
@ -358,4 +375,5 @@ test("comitting and triggerNewPostInStream race condition", function() {
postStream.commitPost(stagedPost);
equal(postStream.get('filteredPostsCount'), 1, "it does not add the same post twice");
});
});