From bb8077e784f3f351e1f7e8905ea44d851b4ed456 Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Fri, 22 Dec 2023 10:29:50 -0500 Subject: [PATCH] Fix `RSpec/LetSetup` cop in models/account_status_cleanup_policy (#28470) --- .rubocop_todo.yml | 4 ---- .../account_statuses_cleanup_policy_spec.rb | 24 +++++++++++-------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 6dcdb3b835..bc66bc4add 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -45,10 +45,6 @@ Metrics/PerceivedComplexity: RSpec/ExampleLength: Max: 22 -RSpec/LetSetup: - Exclude: - - 'spec/models/account_statuses_cleanup_policy_spec.rb' - RSpec/MultipleExpectations: Max: 8 diff --git a/spec/models/account_statuses_cleanup_policy_spec.rb b/spec/models/account_statuses_cleanup_policy_spec.rb index 74fff30c95..da2a774b2d 100644 --- a/spec/models/account_statuses_cleanup_policy_spec.rb +++ b/spec/models/account_statuses_cleanup_policy_spec.rb @@ -235,13 +235,17 @@ RSpec.describe AccountStatusesCleanupPolicy do describe '#compute_cutoff_id' do subject { account_statuses_cleanup_policy.compute_cutoff_id } - let!(:unrelated_status) { Fabricate(:status, created_at: 3.years.ago) } let(:account_statuses_cleanup_policy) { Fabricate(:account_statuses_cleanup_policy, account: account) } + before { Fabricate(:status, created_at: 3.years.ago) } + context 'when the account has posted multiple toots' do - let!(:very_old_status) { Fabricate(:status, created_at: 3.years.ago, account: account) } - let!(:old_status) { Fabricate(:status, created_at: 3.weeks.ago, account: account) } - let!(:recent_status) { Fabricate(:status, created_at: 2.days.ago, account: account) } + let!(:old_status) { Fabricate(:status, created_at: 3.weeks.ago, account: account) } + + before do + Fabricate(:status, created_at: 3.years.ago, account: account) + Fabricate(:status, created_at: 2.days.ago, account: account) + end it 'returns the most recent id that is still below policy age' do expect(subject).to eq old_status.id @@ -270,16 +274,16 @@ RSpec.describe AccountStatusesCleanupPolicy do let!(:faved_secondary) { Fabricate(:status, created_at: 1.year.ago, account: account) } let!(:reblogged_primary) { Fabricate(:status, created_at: 1.year.ago, account: account) } let!(:reblogged_secondary) { Fabricate(:status, created_at: 1.year.ago, account: account) } - let!(:recent_status) { Fabricate(:status, created_at: 2.days.ago, account: account) } - - let!(:media_attachment) { Fabricate(:media_attachment, account: account, status: status_with_media) } - let!(:status_pin) { Fabricate(:status_pin, account: account, status: pinned_status) } - let!(:favourite) { Fabricate(:favourite, account: account, status: self_faved) } - let!(:bookmark) { Fabricate(:bookmark, account: account, status: self_bookmarked) } + let!(:recent_status) { Fabricate(:status, created_at: 2.days.ago, account: account) } let(:account_statuses_cleanup_policy) { Fabricate(:account_statuses_cleanup_policy, account: account) } before do + Fabricate(:media_attachment, account: account, status: status_with_media) + Fabricate(:status_pin, account: account, status: pinned_status) + Fabricate(:favourite, account: account, status: self_faved) + Fabricate(:bookmark, account: account, status: self_bookmarked) + faved_primary.status_stat.update(favourites_count: 4) faved_secondary.status_stat.update(favourites_count: 5) reblogged_primary.status_stat.update(reblogs_count: 4)