Skip to content
代码片段 群组 项目
提交 ce1602b0 编辑于 作者: Etienne Baqué's avatar Etienne Baqué
浏览文件

Merge branch '378910-presenter-approval-rule' into 'master'

Disable RSpec/FactoryBot/AvoidCreate in approval rule presenter specs

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/117659



Merged-by: default avatarEtienne Baqué <ebaque@gitlab.com>
Approved-by: default avatarSerhii Yarynovskyi <syarynovskyi@gitlab.com>
Approved-by: default avatarEtienne Baqué <ebaque@gitlab.com>
Co-authored-by: default avatarPeter Leitzen <pleitzen@gitlab.com>
No related branches found
No related tags found
无相关合并请求
......@@ -533,7 +533,6 @@ RSpec/ContextWording:
- 'ee/spec/policies/project_snippet_policy_spec.rb'
- 'ee/spec/policies/protected_branch_policy_spec.rb'
- 'ee/spec/policies/saml_provider_policy_spec.rb'
- 'ee/spec/presenters/approval_rule_presenter_spec.rb'
- 'ee/spec/presenters/audit_event_presenter_spec.rb'
- 'ee/spec/presenters/ci/build_runner_presenter_spec.rb'
- 'ee/spec/presenters/ee/issue_presenter_spec.rb'
......
......@@ -100,7 +100,6 @@ RSpec/FactoryBot/AvoidCreate:
- 'ee/spec/mailers/emails/user_cap_spec.rb'
- 'ee/spec/mailers/license_mailer_spec.rb'
- 'ee/spec/mailers/notify_spec.rb'
- 'ee/spec/presenters/approval_rule_presenter_spec.rb'
- 'ee/spec/presenters/audit_event_presenter_spec.rb'
- 'ee/spec/presenters/ci/build_runner_presenter_spec.rb'
- 'ee/spec/presenters/ci/minutes/usage_presenter_spec.rb'
......
......@@ -1346,7 +1346,6 @@ RSpec/MissingFeatureCategory:
- 'ee/spec/policies/user_policy_spec.rb'
- 'ee/spec/policies/vulnerability_policy_spec.rb'
- 'ee/spec/presenters/analytics/cycle_analytics/stage_presenter_spec.rb'
- 'ee/spec/presenters/approval_rule_presenter_spec.rb'
- 'ee/spec/presenters/audit_event_presenter_spec.rb'
- 'ee/spec/presenters/ci/build_presenter_spec.rb'
- 'ee/spec/presenters/ci/build_runner_presenter_spec.rb'
......
......@@ -2,7 +2,9 @@
require 'spec_helper'
RSpec.describe ApprovalRulePresenter do
# The presenter is using finders so we must persist records.
# rubocop:disable RSpec/FactoryBot/AvoidCreate
RSpec.describe ApprovalRulePresenter, feature_category: :compliance_management do
let_it_be(:user) { create(:user) }
let_it_be(:public_group) { create(:group) }
let_it_be(:private_group) { create(:group, :private) }
......@@ -22,11 +24,11 @@
rule.clear_memoization(:approvers)
end
context 'user cannot see one of the groups' do
context 'when user cannot see one of the groups' do
it { is_expected.to be_empty }
end
context 'user can see all groups' do
context 'when user can see all groups' do
before do
private_group.add_guest(user)
end
......@@ -52,13 +54,13 @@
end
end
context 'project rule' do
context 'with project rule' do
let(:rule) { create(:approval_project_rule, groups: groups) }
it_behaves_like 'filtering private group'
end
context 'wrapped approval rule' do
context 'with wrapped approval rule' do
let(:rule) do
mr_rule = create(:approval_merge_request_rule, groups: groups)
ApprovalWrappedRule.new(mr_rule.merge_request, mr_rule)
......@@ -67,7 +69,7 @@
it_behaves_like 'filtering private group'
end
context 'any_approver rule' do
context 'with any_approver rule' do
let(:rule) { create(:any_approver_rule) }
it 'contains no groups without raising an error' do
......@@ -93,13 +95,13 @@
end
end
context 'project rule' do
context 'with project rule' do
let(:rule) { create(:approval_project_rule, groups: groups) }
it_behaves_like 'detecting hidden group'
end
context 'wrapped approval rule' do
context 'with wrapped approval rule' do
let(:rule) do
mr_rule = create(:approval_merge_request_rule, groups: groups)
ApprovalWrappedRule.new(mr_rule.merge_request, mr_rule)
......@@ -108,7 +110,7 @@
it_behaves_like 'detecting hidden group'
end
context 'any_approver rule' do
context 'with any_approver rule' do
let(:rule) { create(:any_approver_rule) }
it 'contains no groups without raising an error' do
......@@ -117,3 +119,4 @@
end
end
end
# rubocop:enable RSpec/FactoryBot/AvoidCreate
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册