From c5f8256801c8c840becf0ea7201bb891adf3c35a Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 18 Jul 2024 03:45:59 -0400
Subject: [PATCH] Reduce extra factories in `FanOutOnWriteService` spec
(#31053)
---
.../services/fan_out_on_write_service_spec.rb | 85 ++++++++-----------
1 file changed, 34 insertions(+), 51 deletions(-)
diff --git a/spec/services/fan_out_on_write_service_spec.rb b/spec/services/fan_out_on_write_service_spec.rb
index 82cdffb8c..c6dd020cd 100644
--- a/spec/services/fan_out_on_write_service_spec.rb
+++ b/spec/services/fan_out_on_write_service_spec.rb
@@ -34,21 +34,14 @@ RSpec.describe FanOutOnWriteService do
context 'when status is public' do
let(:visibility) { 'public' }
- it 'is added to the home feed of its author' do
- expect(home_feed_of(alice)).to include status.id
- end
+ it 'adds status to home feed of author and followers and broadcasts', :inline_jobs do
+ expect(status.id)
+ .to be_in(home_feed_of(alice))
+ .and be_in(home_feed_of(bob))
+ .and be_in(home_feed_of(tom))
- it 'is added to the home feed of a follower', :inline_jobs do
- expect(home_feed_of(bob)).to include status.id
- expect(home_feed_of(tom)).to include status.id
- end
-
- it 'is broadcast to the hashtag stream' do
expect(redis).to have_received(:publish).with('timeline:hashtag:hoge', anything)
expect(redis).to have_received(:publish).with('timeline:hashtag:hoge:local', anything)
- end
-
- it 'is broadcast to the public stream' do
expect(redis).to have_received(:publish).with('timeline:public', anything)
expect(redis).to have_received(:publish).with('timeline:public:local', anything)
expect(redis).to have_received(:publish).with('timeline:public:media', anything)
@@ -58,60 +51,41 @@ RSpec.describe FanOutOnWriteService do
context 'when status is limited' do
let(:visibility) { 'limited' }
- it 'is added to the home feed of its author' do
- expect(home_feed_of(alice)).to include status.id
- end
+ it 'adds status to home feed of author and mentioned followers and does not broadcast', :inline_jobs do
+ expect(status.id)
+ .to be_in(home_feed_of(alice))
+ .and be_in(home_feed_of(bob))
+ expect(status.id)
+ .to_not be_in(home_feed_of(tom))
- it 'is added to the home feed of the mentioned follower', :inline_jobs do
- expect(home_feed_of(bob)).to include status.id
- end
-
- it 'is not added to the home feed of the other follower' do
- expect(home_feed_of(tom)).to_not include status.id
- end
-
- it 'is not broadcast publicly' do
- expect(redis).to_not have_received(:publish).with('timeline:hashtag:hoge', anything)
- expect(redis).to_not have_received(:publish).with('timeline:public', anything)
+ expect_no_broadcasting
end
end
context 'when status is private' do
let(:visibility) { 'private' }
- it 'is added to the home feed of its author' do
- expect(home_feed_of(alice)).to include status.id
- end
+ it 'adds status to home feed of author and followers and does not broadcast', :inline_jobs do
+ expect(status.id)
+ .to be_in(home_feed_of(alice))
+ .and be_in(home_feed_of(bob))
+ .and be_in(home_feed_of(tom))
- it 'is added to the home feed of a follower', :inline_jobs do
- expect(home_feed_of(bob)).to include status.id
- expect(home_feed_of(tom)).to include status.id
- end
-
- it 'is not broadcast publicly' do
- expect(redis).to_not have_received(:publish).with('timeline:hashtag:hoge', anything)
- expect(redis).to_not have_received(:publish).with('timeline:public', anything)
+ expect_no_broadcasting
end
end
context 'when status is direct' do
let(:visibility) { 'direct' }
- it 'is added to the home feed of its author' do
- expect(home_feed_of(alice)).to include status.id
- end
+ it 'is added to the home feed of its author and mentioned followers and does not broadcast', :inline_jobs do
+ expect(status.id)
+ .to be_in(home_feed_of(alice))
+ .and be_in(home_feed_of(bob))
+ expect(status.id)
+ .to_not be_in(home_feed_of(tom))
- it 'is added to the home feed of the mentioned follower', :inline_jobs do
- expect(home_feed_of(bob)).to include status.id
- end
-
- it 'is not added to the home feed of the other follower' do
- expect(home_feed_of(tom)).to_not include status.id
- end
-
- it 'is not broadcast publicly' do
- expect(redis).to_not have_received(:publish).with('timeline:hashtag:hoge', anything)
- expect(redis).to_not have_received(:publish).with('timeline:public', anything)
+ expect_no_broadcasting
end
context 'when handling status updates' do
@@ -131,4 +105,13 @@ RSpec.describe FanOutOnWriteService do
end
end
end
+
+ def expect_no_broadcasting
+ expect(redis)
+ .to_not have_received(:publish)
+ .with('timeline:hashtag:hoge', anything)
+ expect(redis)
+ .to_not have_received(:publish)
+ .with('timeline:public', anything)
+ end
end