From e6e217fedd13251db166010814a6ae0cdba2ad96 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 22 Dec 2023 03:32:27 -0500
Subject: [PATCH] Clean up `tagged_with_*` Status specs, fix `RSpec/LetSetup`
cop (#28462)
---
.rubocop_todo.yml | 1 -
spec/models/status_spec.rb | 69 ++++++++++++++++++++++++++++----------
spec/rails_helper.rb | 1 +
3 files changed, 52 insertions(+), 19 deletions(-)
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 384f80923..11bacb3b1 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -48,7 +48,6 @@ RSpec/ExampleLength:
RSpec/LetSetup:
Exclude:
- 'spec/models/account_statuses_cleanup_policy_spec.rb'
- - 'spec/models/status_spec.rb'
- 'spec/services/activitypub/fetch_featured_collection_service_spec.rb'
RSpec/MultipleExpectations:
diff --git a/spec/models/status_spec.rb b/spec/models/status_spec.rb
index 938d0546d..284576ced 100644
--- a/spec/models/status_spec.rb
+++ b/spec/models/status_spec.rb
@@ -265,17 +265,29 @@ RSpec.describe Status do
context 'when given one tag' do
it 'returns the expected statuses' do
- expect(described_class.tagged_with([tag_cats.id]).reorder(:id).pluck(:id).uniq).to contain_exactly(status_with_tag_cats.id, status_with_all_tags.id)
- expect(described_class.tagged_with([tag_dogs.id]).reorder(:id).pluck(:id).uniq).to contain_exactly(status_with_tag_dogs.id, status_with_all_tags.id)
- expect(described_class.tagged_with([tag_zebras.id]).reorder(:id).pluck(:id).uniq).to contain_exactly(status_tagged_with_zebras.id, status_with_all_tags.id)
+ expect(described_class.tagged_with([tag_cats.id]))
+ .to include(status_with_tag_cats, status_with_all_tags)
+ .and not_include(status_without_tags)
+ expect(described_class.tagged_with([tag_dogs.id]))
+ .to include(status_with_tag_dogs, status_with_all_tags)
+ .and not_include(status_without_tags)
+ expect(described_class.tagged_with([tag_zebras.id]))
+ .to include(status_tagged_with_zebras, status_with_all_tags)
+ .and not_include(status_without_tags)
end
end
context 'when given multiple tags' do
it 'returns the expected statuses' do
- expect(described_class.tagged_with([tag_cats.id, tag_dogs.id]).reorder(:id).pluck(:id).uniq).to contain_exactly(status_with_tag_cats.id, status_with_tag_dogs.id, status_with_all_tags.id)
- expect(described_class.tagged_with([tag_cats.id, tag_zebras.id]).reorder(:id).pluck(:id).uniq).to contain_exactly(status_with_tag_cats.id, status_tagged_with_zebras.id, status_with_all_tags.id)
- expect(described_class.tagged_with([tag_dogs.id, tag_zebras.id]).reorder(:id).pluck(:id).uniq).to contain_exactly(status_with_tag_dogs.id, status_tagged_with_zebras.id, status_with_all_tags.id)
+ expect(described_class.tagged_with([tag_cats.id, tag_dogs.id]))
+ .to include(status_with_tag_cats, status_with_tag_dogs, status_with_all_tags)
+ .and not_include(status_without_tags)
+ expect(described_class.tagged_with([tag_cats.id, tag_zebras.id]))
+ .to include(status_with_tag_cats, status_tagged_with_zebras, status_with_all_tags)
+ .and not_include(status_without_tags)
+ expect(described_class.tagged_with([tag_dogs.id, tag_zebras.id]))
+ .to include(status_with_tag_dogs, status_tagged_with_zebras, status_with_all_tags)
+ .and not_include(status_without_tags)
end
end
end
@@ -292,17 +304,26 @@ RSpec.describe Status do
context 'when given one tag' do
it 'returns the expected statuses' do
- expect(described_class.tagged_with_all([tag_cats.id]).reorder(:id).pluck(:id).uniq).to contain_exactly(status_with_tag_cats.id, status_with_all_tags.id)
- expect(described_class.tagged_with_all([tag_dogs.id]).reorder(:id).pluck(:id).uniq).to contain_exactly(status_with_tag_dogs.id, status_with_all_tags.id)
- expect(described_class.tagged_with_all([tag_zebras.id]).reorder(:id).pluck(:id).uniq).to contain_exactly(status_tagged_with_zebras.id)
+ expect(described_class.tagged_with_all([tag_cats.id]))
+ .to include(status_with_tag_cats, status_with_all_tags)
+ .and not_include(status_without_tags)
+ expect(described_class.tagged_with_all([tag_dogs.id]))
+ .to include(status_with_tag_dogs, status_with_all_tags)
+ .and not_include(status_without_tags)
+ expect(described_class.tagged_with_all([tag_zebras.id]))
+ .to include(status_tagged_with_zebras)
+ .and not_include(status_without_tags)
end
end
context 'when given multiple tags' do
it 'returns the expected statuses' do
- expect(described_class.tagged_with_all([tag_cats.id, tag_dogs.id]).reorder(:id).pluck(:id).uniq).to contain_exactly(status_with_all_tags.id)
- expect(described_class.tagged_with_all([tag_cats.id, tag_zebras.id]).reorder(:id).pluck(:id).uniq).to eq []
- expect(described_class.tagged_with_all([tag_dogs.id, tag_zebras.id]).reorder(:id).pluck(:id).uniq).to eq []
+ expect(described_class.tagged_with_all([tag_cats.id, tag_dogs.id]))
+ .to include(status_with_all_tags)
+ expect(described_class.tagged_with_all([tag_cats.id, tag_zebras.id]))
+ .to eq []
+ expect(described_class.tagged_with_all([tag_dogs.id, tag_zebras.id]))
+ .to eq []
end
end
end
@@ -319,17 +340,29 @@ RSpec.describe Status do
context 'when given one tag' do
it 'returns the expected statuses' do
- expect(described_class.tagged_with_none([tag_cats.id]).reorder(:id).pluck(:id).uniq).to contain_exactly(status_with_tag_dogs.id, status_tagged_with_zebras.id, status_without_tags.id)
- expect(described_class.tagged_with_none([tag_dogs.id]).reorder(:id).pluck(:id).uniq).to contain_exactly(status_with_tag_cats.id, status_tagged_with_zebras.id, status_without_tags.id)
- expect(described_class.tagged_with_none([tag_zebras.id]).reorder(:id).pluck(:id).uniq).to contain_exactly(status_with_tag_cats.id, status_with_tag_dogs.id, status_without_tags.id)
+ expect(described_class.tagged_with_none([tag_cats.id]))
+ .to include(status_with_tag_dogs, status_tagged_with_zebras, status_without_tags)
+ .and not_include(status_with_all_tags)
+ expect(described_class.tagged_with_none([tag_dogs.id]))
+ .to include(status_with_tag_cats, status_tagged_with_zebras, status_without_tags)
+ .and not_include(status_with_all_tags)
+ expect(described_class.tagged_with_none([tag_zebras.id]))
+ .to include(status_with_tag_cats, status_with_tag_dogs, status_without_tags)
+ .and not_include(status_with_all_tags)
end
end
context 'when given multiple tags' do
it 'returns the expected statuses' do
- expect(described_class.tagged_with_none([tag_cats.id, tag_dogs.id]).reorder(:id).pluck(:id).uniq).to contain_exactly(status_tagged_with_zebras.id, status_without_tags.id)
- expect(described_class.tagged_with_none([tag_cats.id, tag_zebras.id]).reorder(:id).pluck(:id).uniq).to contain_exactly(status_with_tag_dogs.id, status_without_tags.id)
- expect(described_class.tagged_with_none([tag_dogs.id, tag_zebras.id]).reorder(:id).pluck(:id).uniq).to contain_exactly(status_with_tag_cats.id, status_without_tags.id)
+ expect(described_class.tagged_with_none([tag_cats.id, tag_dogs.id]))
+ .to include(status_tagged_with_zebras, status_without_tags)
+ .and not_include(status_with_all_tags)
+ expect(described_class.tagged_with_none([tag_cats.id, tag_zebras.id]))
+ .to include(status_with_tag_dogs, status_without_tags)
+ .and not_include(status_with_all_tags)
+ expect(described_class.tagged_with_none([tag_dogs.id, tag_zebras.id]))
+ .to include(status_with_tag_cats, status_without_tags)
+ .and not_include(status_with_all_tags)
end
end
end
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 0e68fbe12..c9352a4d5 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -153,6 +153,7 @@ RSpec::Sidekiq.configure do |config|
end
RSpec::Matchers.define_negated_matcher :not_change, :change
+RSpec::Matchers.define_negated_matcher :not_include, :include
def request_fixture(name)
Rails.root.join('spec', 'fixtures', 'requests', name).read