Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Merge branch 'master' into glitch-soc/merge-upstream

Browse source 
Conflicts:
- `app/controllers/activitypub/collections_controller.rb`:
  Conflict caused because we have additional code to make sure pinned
  local-only toots don't get rendered on the ActivityPub endpoints.
  Ported upstream changes.
This commit is contained in:
Thibaut Girka 2020-09-07 09:21:38 +02:00
commit e5f934ddf0
18 changed files with 128 additions and 138 deletions
Download patch file Download diff file Expand all files Collapse all files

4
spec/lib/feed_manager_spec.rb
View file

@ -448,7 +448,7 @@ RSpec.describe FeedManager do
FeedManager.instance.push_to_home(receiver, another_status)
# We should have a tracking set and an entry in reblogs.
expect(Redis.current.exists(reblog_set_key)).to be true
expect(Redis.current.exists?(reblog_set_key)).to be true
expect(Redis.current.zrange(reblogs_key, 0, -1)).to eq [reblogged.id.to_s]
# Push everything off the end of the feed.
@ -461,7 +461,7 @@ RSpec.describe FeedManager do
FeedManager.instance.trim('home', receiver.id)
# We should not have any reblog tracking data.
expect(Redis.current.exists(reblog_set_key)).to be false
expect(Redis.current.exists?(reblog_set_key)).to be false
expect(Redis.current.zrange(reblogs_key, 0, -1)).to be_empty
end
end