From 59804abc3d59070e56e0c541884a54fb88242eb2 Mon Sep 17 00:00:00 2001 From: alpaca-tc Date: Sat, 6 May 2017 23:31:07 +0900 Subject: Optimize MuteService and AfterBlockService (#2836) --- spec/services/after_block_service_spec.rb | 29 ++++++++++++++++++++++++++++ spec/services/mute_service_spec.rb | 32 ++++++++++++++++++++++++++++++- 2 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 spec/services/after_block_service_spec.rb (limited to 'spec/services') diff --git a/spec/services/after_block_service_spec.rb b/spec/services/after_block_service_spec.rb new file mode 100644 index 000000000..65f36c7d1 --- /dev/null +++ b/spec/services/after_block_service_spec.rb @@ -0,0 +1,29 @@ +require 'rails_helper' + +RSpec.describe AfterBlockService do + subject do + -> { described_class.new.call(account, target_account) } + end + + let(:account) { Fabricate(:account) } + let(:target_account) { Fabricate(:account) } + + describe 'home timeline' do + let(:status) { Fabricate(:status, account: target_account) } + let(:other_account_status) { Fabricate(:status) } + let(:home_timeline_key) { FeedManager.instance.key(:home, account.id) } + + before do + Redis.current.del(home_timeline_key) + end + + it "clears account's statuses" do + FeedManager.instance.push(:home, account, status) + FeedManager.instance.push(:home, account, other_account_status) + + is_expected.to change { + Redis.current.zrange(home_timeline_key, 0, -1) + }.from([status.id.to_s, other_account_status.id.to_s]).to([other_account_status.id.to_s]) + end + end +end diff --git a/spec/services/mute_service_spec.rb b/spec/services/mute_service_spec.rb index 397368416..8097cb250 100644 --- a/spec/services/mute_service_spec.rb +++ b/spec/services/mute_service_spec.rb @@ -1,5 +1,35 @@ require 'rails_helper' RSpec.describe MuteService do - subject { MuteService.new } + subject do + -> { described_class.new.call(account, target_account) } + end + + let(:account) { Fabricate(:account) } + let(:target_account) { Fabricate(:account) } + + describe 'home timeline' do + let(:status) { Fabricate(:status, account: target_account) } + let(:other_account_status) { Fabricate(:status) } + let(:home_timeline_key) { FeedManager.instance.key(:home, account.id) } + + before do + Redis.current.del(home_timeline_key) + end + + it "clears account's statuses" do + FeedManager.instance.push(:home, account, status) + FeedManager.instance.push(:home, account, other_account_status) + + is_expected.to change { + Redis.current.zrange(home_timeline_key, 0, -1) + }.from([status.id.to_s, other_account_status.id.to_s]).to([other_account_status.id.to_s]) + end + end + + it 'mutes account' do + is_expected.to change { + account.muting?(target_account) + }.from(false).to(true) + end end -- cgit