diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-09-07 09:21:38 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-09-07 09:21:38 +0200 |
| commit | e5f934ddf0aa4ef9efbf45751bc00bebff768d99 (patch) | |
| tree | 322231d7d50704edf8da762b69ee22c9850f2ce3 /spec/workers/scheduler | |
| parent | d967251fdc3826ad27d30e55258cfa4cdfd7c871 (diff) | |
| parent | a6121a159c5305ea9faa95743a50babb23ab41cd (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
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.
Diffstat (limited to 'spec/workers/scheduler')
| -rw-r--r-- | spec/workers/scheduler/feed_cleanup_scheduler_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/workers/scheduler/feed_cleanup_scheduler_spec.rb b/spec/workers/scheduler/feed_cleanup_scheduler_spec.rb index 7fae680ba..914eed829 100644 --- a/spec/workers/scheduler/feed_cleanup_scheduler_spec.rb +++ b/spec/workers/scheduler/feed_cleanup_scheduler_spec.rb @@ -16,8 +16,8 @@ describe Scheduler::FeedCleanupScheduler do expect(Redis.current.zcard(feed_key_for(inactive_user))).to eq 0 expect(Redis.current.zcard(feed_key_for(active_user))).to eq 1 - expect(Redis.current.exists(feed_key_for(inactive_user, 'reblogs'))).to be false - expect(Redis.current.exists(feed_key_for(inactive_user, 'reblogs:2'))).to be false + expect(Redis.current.exists?(feed_key_for(inactive_user, 'reblogs'))).to be false + expect(Redis.current.exists?(feed_key_for(inactive_user, 'reblogs:2'))).to be false end def feed_key_for(user, subtype = nil) |