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/lib | |
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/lib')
-rw-r--r-- | spec/lib/feed_manager_spec.rb | 4 | ||||
-rw-r--r-- | spec/lib/spam_check_spec.rb | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/spec/lib/feed_manager_spec.rb b/spec/lib/feed_manager_spec.rb index 40e8214b6..bb5bdfdc5 100644 --- a/spec/lib/feed_manager_spec.rb +++ b/spec/lib/feed_manager_spec.rb @@ -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 diff --git a/spec/lib/spam_check_spec.rb b/spec/lib/spam_check_spec.rb index d4d66a499..159d83257 100644 --- a/spec/lib/spam_check_spec.rb +++ b/spec/lib/spam_check_spec.rb @@ -150,9 +150,9 @@ RSpec.describe SpamCheck do let(:redis_key) { spam_check.send(:redis_key) } it 'remembers' do - expect(Redis.current.exists(redis_key)).to be true + expect(Redis.current.exists?(redis_key)).to be true spam_check.remember! - expect(Redis.current.exists(redis_key)).to be true + expect(Redis.current.exists?(redis_key)).to be true end end @@ -166,9 +166,9 @@ RSpec.describe SpamCheck do end it 'resets' do - expect(Redis.current.exists(redis_key)).to be true + expect(Redis.current.exists?(redis_key)).to be true spam_check.reset! - expect(Redis.current.exists(redis_key)).to be false + expect(Redis.current.exists?(redis_key)).to be false end end |