Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
4e1dfeda
Commit
4e1dfeda
authored
Jan 19, 2021
by
Nicolas Dular
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Record onboarding action for MR approval rule
parent
1194e3e3
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
32 additions
and
0 deletions
+32
-0
ee/app/services/approval_rules/create_service.rb
ee/app/services/approval_rules/create_service.rb
+10
-0
ee/spec/services/approval_rules/create_service_spec.rb
ee/spec/services/approval_rules/create_service_spec.rb
+22
-0
No files found.
ee/app/services/approval_rules/create_service.rb
View file @
4e1dfeda
...
...
@@ -23,6 +23,12 @@ module ApprovalRules
super
(
@rule
.
project
,
user
,
params
)
end
def
success
track_onboarding_progress
super
end
private
def
copy_approval_project_rule_properties
(
params
)
...
...
@@ -59,5 +65,9 @@ module ApprovalRules
def
approvers_present?
%i(user_ids group_ids users groups)
.
any?
{
|
key
|
@params
[
key
].
present?
}
end
def
track_onboarding_progress
OnboardingProgressService
.
new
(
rule
.
project
.
namespace
).
execute
(
action: :required_mr_approvals_enabled
)
end
end
end
ee/spec/services/approval_rules/create_service_spec.rb
View file @
4e1dfeda
...
...
@@ -62,6 +62,15 @@ RSpec.describe ApprovalRules::CreateService do
expect
(
result
[
:status
]).
to
eq
(
:error
)
end
it_behaves_like
'does not record an onboarding progress action'
do
subject
do
described_class
.
new
(
target
,
user
,
{
name:
nil
,
approvals_required:
1
}).
execute
end
end
end
context
'when user does not have right to admin project'
do
...
...
@@ -114,6 +123,19 @@ RSpec.describe ApprovalRules::CreateService do
expect
{
subject
.
execute
}.
not_to
change
(
target
.
approval_rules
.
any_approver
,
:count
)
end
end
it_behaves_like
'records an onboarding progress action'
,
:required_mr_approvals_enabled
do
let
(
:namespace
)
{
project
.
namespace
}
subject
do
described_class
.
new
(
target
,
user
,
{
name:
'security'
,
approvals_required:
1
,
user_ids:
new_approvers
.
map
(
&
:id
),
group_ids:
new_groups
.
map
(
&
:id
)
}).
execute
end
end
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment