From e387175fc9a3ebfd72ab45ebfe43ecfabef7b0c3 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 23 May 2023 04:49:23 -0400
Subject: [PATCH] Fix RSpec/RepeatedExample cop (#24849)
---
.rubocop_todo.yml | 4 -
spec/policies/status_policy_spec.rb | 174 +++++++++++++++-------------
2 files changed, 93 insertions(+), 85 deletions(-)
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 6fb910005a..de6857e071 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -571,10 +571,6 @@ RSpec/PredicateMatcher:
- 'spec/models/user_spec.rb'
- 'spec/services/post_status_service_spec.rb'
-RSpec/RepeatedExample:
- Exclude:
- - 'spec/policies/status_policy_spec.rb'
-
RSpec/StubbedMock:
Exclude:
- 'spec/controllers/api/base_controller_spec.rb'
diff --git a/spec/policies/status_policy_spec.rb b/spec/policies/status_policy_spec.rb
index 9ae54780eb..36ac8d8027 100644
--- a/spec/policies/status_policy_spec.rb
+++ b/spec/policies/status_policy_spec.rb
@@ -11,127 +11,139 @@ RSpec.describe StatusPolicy, type: :model do
let(:bob) { Fabricate(:account, username: 'bob') }
let(:status) { Fabricate(:status, account: alice) }
- permissions :show?, :reblog? do
- it 'grants access when no viewer' do
- expect(subject).to permit(nil, status)
- end
+ context 'with the permissions of show? and reblog?' do
+ permissions :show?, :reblog? do
+ it 'grants access when no viewer' do
+ expect(subject).to permit(nil, status)
+ end
- it 'denies access when viewer is blocked' do
- block = Fabricate(:block)
- status.visibility = :private
- status.account = block.target_account
+ it 'denies access when viewer is blocked' do
+ block = Fabricate(:block)
+ status.visibility = :private
+ status.account = block.target_account
- expect(subject).to_not permit(block.account, status)
+ expect(subject).to_not permit(block.account, status)
+ end
end
end
- permissions :show? do
- it 'grants access when direct and account is viewer' do
- status.visibility = :direct
+ context 'with the permission of show?' do
+ permissions :show? do
+ it 'grants access when direct and account is viewer' do
+ status.visibility = :direct
- expect(subject).to permit(status.account, status)
- end
+ expect(subject).to permit(status.account, status)
+ end
- it 'grants access when direct and viewer is mentioned' do
- status.visibility = :direct
- status.mentions = [Fabricate(:mention, account: alice)]
+ it 'grants access when direct and viewer is mentioned' do
+ status.visibility = :direct
+ status.mentions = [Fabricate(:mention, account: alice)]
- expect(subject).to permit(alice, status)
- end
+ expect(subject).to permit(alice, status)
+ end
- it 'grants access when direct and non-owner viewer is mentioned and mentions are loaded' do
- status.visibility = :direct
- status.mentions = [Fabricate(:mention, account: bob)]
- status.mentions.load
+ it 'grants access when direct and non-owner viewer is mentioned and mentions are loaded' do
+ status.visibility = :direct
+ status.mentions = [Fabricate(:mention, account: bob)]
+ status.mentions.load
- expect(subject).to permit(bob, status)
- end
+ expect(subject).to permit(bob, status)
+ end
- it 'denies access when direct and viewer is not mentioned' do
- viewer = Fabricate(:account)
- status.visibility = :direct
+ it 'denies access when direct and viewer is not mentioned' do
+ viewer = Fabricate(:account)
+ status.visibility = :direct
- expect(subject).to_not permit(viewer, status)
- end
+ expect(subject).to_not permit(viewer, status)
+ end
- it 'grants access when private and account is viewer' do
- status.visibility = :private
+ it 'grants access when private and account is viewer' do
+ status.visibility = :private
- expect(subject).to permit(status.account, status)
- end
+ expect(subject).to permit(status.account, status)
+ end
- it 'grants access when private and account is following viewer' do
- follow = Fabricate(:follow)
- status.visibility = :private
- status.account = follow.target_account
+ it 'grants access when private and account is following viewer' do
+ follow = Fabricate(:follow)
+ status.visibility = :private
+ status.account = follow.target_account
- expect(subject).to permit(follow.account, status)
- end
+ expect(subject).to permit(follow.account, status)
+ end
- it 'grants access when private and viewer is mentioned' do
- status.visibility = :private
- status.mentions = [Fabricate(:mention, account: alice)]
+ it 'grants access when private and viewer is mentioned' do
+ status.visibility = :private
+ status.mentions = [Fabricate(:mention, account: alice)]
- expect(subject).to permit(alice, status)
- end
+ expect(subject).to permit(alice, status)
+ end
- it 'denies access when private and viewer is not mentioned or followed' do
- viewer = Fabricate(:account)
- status.visibility = :private
+ it 'denies access when private and viewer is not mentioned or followed' do
+ viewer = Fabricate(:account)
+ status.visibility = :private
- expect(subject).to_not permit(viewer, status)
+ expect(subject).to_not permit(viewer, status)
+ end
end
end
- permissions :reblog? do
- it 'denies access when private' do
- viewer = Fabricate(:account)
- status.visibility = :private
+ context 'with the permission of reblog?' do
+ permissions :reblog? do
+ it 'denies access when private' do
+ viewer = Fabricate(:account)
+ status.visibility = :private
- expect(subject).to_not permit(viewer, status)
- end
+ expect(subject).to_not permit(viewer, status)
+ end
- it 'denies access when direct' do
- viewer = Fabricate(:account)
- status.visibility = :direct
+ it 'denies access when direct' do
+ viewer = Fabricate(:account)
+ status.visibility = :direct
- expect(subject).to_not permit(viewer, status)
+ expect(subject).to_not permit(viewer, status)
+ end
end
end
- permissions :destroy?, :unreblog? do
- it 'grants access when account is deleter' do
- expect(subject).to permit(status.account, status)
- end
+ context 'with the permissions of destroy? and unreblog?' do
+ permissions :destroy?, :unreblog? do
+ it 'grants access when account is deleter' do
+ expect(subject).to permit(status.account, status)
+ end
- it 'denies access when account is not deleter' do
- expect(subject).to_not permit(bob, status)
- end
+ it 'denies access when account is not deleter' do
+ expect(subject).to_not permit(bob, status)
+ end
- it 'denies access when no deleter' do
- expect(subject).to_not permit(nil, status)
+ it 'denies access when no deleter' do
+ expect(subject).to_not permit(nil, status)
+ end
end
end
- permissions :favourite? do
- it 'grants access when viewer is not blocked' do
- follow = Fabricate(:follow)
- status.account = follow.target_account
+ context 'with the permission of favourite?' do
+ permissions :favourite? do
+ it 'grants access when viewer is not blocked' do
+ follow = Fabricate(:follow)
+ status.account = follow.target_account
- expect(subject).to permit(follow.account, status)
- end
+ expect(subject).to permit(follow.account, status)
+ end
- it 'denies when viewer is blocked' do
- block = Fabricate(:block)
- status.account = block.target_account
+ it 'denies when viewer is blocked' do
+ block = Fabricate(:block)
+ status.account = block.target_account
- expect(subject).to_not permit(block.account, status)
+ expect(subject).to_not permit(block.account, status)
+ end
end
end
- permissions :update? do
- it 'grants access if owner' do
- expect(subject).to permit(status.account, status)
+ context 'with the permission of update?' do
+ permissions :update? do
+ it 'grants access if owner' do
+ expect(subject).to permit(status.account, status)
+ end
end
end
end
--
GitLab