about summary refs log tree commit diff
path: root/spec/lib
diff options
context:
space:
mode:
authorunarist <m.unarist@gmail.com>2017-10-16 22:58:23 +0900
committerEugen Rochko <eugen@zeonfederated.com>2017-10-16 15:58:23 +0200
commit6f490b4bfed5fba9bd543a4c99b5694f37cd1f99 (patch)
treeb2944c5a72b32b1943542d39b41301aca687df28 /spec/lib
parent03975dbde4488d2ec015fb95010084ae371b4546 (diff)
Fix un-reblogged status being at wrong position in the home timeline (#5418)
We've changed un-reblogging behavior when we implement Snowflake, to insert un-reblogged status at the position reblogging status existed.

However, our API expects home timeline is ordered by status ids, and max_id/since_id filters by zset score. Due to this, un-reblogged status appears as a last item of result set, and timeline expansion may skips many statuses.

So this reverts that change...reblogged status inserted at corresponding position to its id.
Diffstat (limited to 'spec/lib')
-rw-r--r--spec/lib/feed_manager_spec.rb9
1 files changed, 6 insertions, 3 deletions
diff --git a/spec/lib/feed_manager_spec.rb b/spec/lib/feed_manager_spec.rb
index 923894ccb..643f1f003 100644
--- a/spec/lib/feed_manager_spec.rb
+++ b/spec/lib/feed_manager_spec.rb
@@ -233,19 +233,22 @@ RSpec.describe FeedManager do
   describe '#unpush' do
     it 'leaves a reblogged status when deleting the reblog' do
       account = Fabricate(:account)
-      reblogged = Fabricate(:status)
+      reblogged = Fabricate(:status, id: Mastodon::Snowflake.id_at(2.day.ago.utc))
+      other_status = Fabricate(:status, id: Mastodon::Snowflake.id_at(1.day.ago.utc))
       status = Fabricate(:status, reblog: reblogged)
 
+      FeedManager.instance.push('type', account, other_status)
       FeedManager.instance.push('type', account, status)
 
       # The reblogging status should show up under normal conditions.
-      expect(Redis.current.zrange("feed:type:#{account.id}", 0, -1)).to eq [status.id.to_s]
+      expect(Redis.current.zrange("feed:type:#{account.id}", 0, -1)).to eq [other_status.id.to_s, status.id.to_s]
 
       FeedManager.instance.unpush('type', account, status)
 
       # Because we couldn't tell if the status showed up any other way,
       # we had to stick the reblogged status in by itself.
-      expect(Redis.current.zrange("feed:type:#{account.id}", 0, -1)).to eq [reblogged.id.to_s]
+      # And it must be ordered by status ids.
+      expect(Redis.current.zrange("feed:type:#{account.id}", 0, -1)).to eq [reblogged.id.to_s, other_status.id.to_s]
     end
 
     it 'sends push updates' do