diff --git a/.rubocop_manual_todo.yml b/.rubocop_manual_todo.yml index 8d79a2eff853282405168efae6a8351d4d0210a4..aa22a908ceea63176b3677ceef7aaaec4c67ada6 100644 --- a/.rubocop_manual_todo.yml +++ b/.rubocop_manual_todo.yml @@ -896,13 +896,6 @@ RSpec/EmptyLineAfterFinalLetItBe: - spec/models/user_spec.rb - spec/models/wiki_page/meta_spec.rb - spec/models/wiki_page_spec.rb - - spec/policies/application_setting/term_policy_spec.rb - - spec/policies/ci/build_policy_spec.rb - - spec/policies/design_management/design_policy_spec.rb - - spec/policies/group_deploy_keys_group_policy_spec.rb - - spec/policies/group_policy_spec.rb - - spec/policies/project_snippet_policy_spec.rb - - spec/policies/service_policy_spec.rb - spec/presenters/alert_management/alert_presenter_spec.rb - spec/presenters/ci/pipeline_presenter_spec.rb - spec/presenters/label_presenter_spec.rb diff --git a/changelogs/unreleased/issue-325836-fix-empty-line-after-let-it-be-policies.yml b/changelogs/unreleased/issue-325836-fix-empty-line-after-let-it-be-policies.yml new file mode 100644 index 0000000000000000000000000000000000000000..3d61b9fa7f2c65723ae50402f3f628f3d2ebc535 --- /dev/null +++ b/changelogs/unreleased/issue-325836-fix-empty-line-after-let-it-be-policies.yml @@ -0,0 +1,5 @@ +--- +title: Fix EmptyLineAfterFinalLetItBe offenses in spec/policies +merge_request: 58393 +author: Huzaifa Iftikhar @huzaifaiftikhar +type: fixed diff --git a/spec/policies/application_setting/term_policy_spec.rb b/spec/policies/application_setting/term_policy_spec.rb index 00b48402fa6096df0b03d4ead3ad3c72b0b55a03..fd361c8b649879875039f7a2c3d144edc16855a5 100644 --- a/spec/policies/application_setting/term_policy_spec.rb +++ b/spec/policies/application_setting/term_policy_spec.rb @@ -6,6 +6,7 @@ include TermsHelper let_it_be(:term) { create(:term) } + let(:user) { create(:user) } subject(:policy) { described_class.new(user, term) } diff --git a/spec/policies/ci/build_policy_spec.rb b/spec/policies/ci/build_policy_spec.rb index 098efd7daa62820aaab0153b6f032522d2552208..1ec749fb394c1386c700e3e65149373c125f0271 100644 --- a/spec/policies/ci/build_policy_spec.rb +++ b/spec/policies/ci/build_policy_spec.rb @@ -283,6 +283,7 @@ describe 'manage a web ide terminal' do let(:build_permissions) { %i[read_web_ide_terminal create_build_terminal update_web_ide_terminal create_build_service_proxy] } let_it_be(:maintainer) { create(:user) } + let(:owner) { create(:owner) } let(:admin) { create(:admin) } let(:maintainer) { create(:user) } diff --git a/spec/policies/design_management/design_policy_spec.rb b/spec/policies/design_management/design_policy_spec.rb index 117279d16389f404f4d0fb368676542ea26d95de..c62e97dcdb9c81713b0742e6a240cb6802fb8240 100644 --- a/spec/policies/design_management/design_policy_spec.rb +++ b/spec/policies/design_management/design_policy_spec.rb @@ -16,6 +16,7 @@ let_it_be(:admin) { create(:admin) } let_it_be(:project) { create(:project, :public, namespace: owner.namespace) } let_it_be(:issue) { create(:issue, project: project) } + let(:design) { create(:design, issue: issue) } subject(:design_policy) { described_class.new(current_user, design) } @@ -131,6 +132,7 @@ context "for guests in private projects" do let_it_be(:project) { create(:project, :private) } + let(:current_user) { guest } it_behaves_like "read-only design abilities" @@ -163,6 +165,7 @@ context "when the project is archived" do let_it_be(:project) { create(:project, :public, :archived) } let_it_be(:issue) { create(:issue, project: project) } + let(:current_user) { owner } it_behaves_like "read-only design abilities" diff --git a/spec/policies/group_deploy_keys_group_policy_spec.rb b/spec/policies/group_deploy_keys_group_policy_spec.rb index 7ad9b655411999f04056ccae808ed9506fc6ab83..50d555d2094a3fdfac8de14321720a72e69ce307 100644 --- a/spec/policies/group_deploy_keys_group_policy_spec.rb +++ b/spec/policies/group_deploy_keys_group_policy_spec.rb @@ -8,6 +8,7 @@ let_it_be(:user) { create(:user) } let_it_be(:group) { create(:group) } let_it_be(:group_deploy_key) { create(:group_deploy_key) } + let(:group_deploy_keys_group) { create(:group_deploy_keys_group, group: group, group_deploy_key: group_deploy_key) } describe 'edit a group deploy key for a given group' do diff --git a/spec/policies/group_policy_spec.rb b/spec/policies/group_policy_spec.rb index 1aab6f5ca29f961b989721d1254e89c2e06c7263..f5e389ff33849765e1466e01f053449d2a26f0c9 100644 --- a/spec/policies/group_policy_spec.rb +++ b/spec/policies/group_policy_spec.rb @@ -722,6 +722,7 @@ describe 'design activity' do let_it_be(:group) { create(:group, :public) } + let(:current_user) { nil } subject { described_class.new(current_user, group) } diff --git a/spec/policies/project_snippet_policy_spec.rb b/spec/policies/project_snippet_policy_spec.rb index bdf9eaedbf18e9dc595dc3109a373738362f1cd0..8b96aa99f69430dba25ef033985f1a9694a61c68 100644 --- a/spec/policies/project_snippet_policy_spec.rb +++ b/spec/policies/project_snippet_policy_spec.rb @@ -8,6 +8,7 @@ let_it_be(:other_user) { create(:user) } let_it_be(:external_user) { create(:user, :external) } let_it_be(:project) { create(:project, :public) } + let(:snippet) { create(:project_snippet, snippet_visibility, project: project, author: author) } let(:author) { other_user } let(:author_permissions) do diff --git a/spec/policies/service_policy_spec.rb b/spec/policies/service_policy_spec.rb index 5d2c9c1f6c3ea70587491b751718b265b7aad817..84c74ca7e31a2c3d39dc19e815290051fc3f91ef 100644 --- a/spec/policies/service_policy_spec.rb +++ b/spec/policies/service_policy_spec.rb @@ -4,6 +4,7 @@ RSpec.describe ServicePolicy, :models do let_it_be(:user) { create(:user) } + let(:project) { integration.project } subject(:policy) { Ability.policy_for(user, integration) }