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
b6cc96d0
Commit
b6cc96d0
authored
Jan 13, 2021
by
Gary Holtz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adding some refactoring suggestions
parent
3fc2145c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
28 additions
and
10 deletions
+28
-10
lib/gitlab/quick_actions/merge_request_actions.rb
lib/gitlab/quick_actions/merge_request_actions.rb
+6
-6
spec/services/quick_actions/interpret_service_spec.rb
spec/services/quick_actions/interpret_service_spec.rb
+22
-4
No files found.
lib/gitlab/quick_actions/merge_request_actions.rb
View file @
b6cc96d0
...
...
@@ -253,12 +253,12 @@ module Gitlab
end
def
reviewers_to_add
(
users
)
if
users
.
present
?
if
quick_action_target
.
allows_multiple_reviewers?
users
else
[
users
.
first
]
end
return
if
users
.
blank
?
if
quick_action_target
.
allows_multiple_reviewers?
users
else
[
users
.
first
]
end
end
...
...
spec/services/quick_actions/interpret_service_spec.rb
View file @
b6cc96d0
...
...
@@ -669,23 +669,19 @@ RSpec.describe QuickActions::InterpretService do
shared_examples
'assign_reviewer command'
do
it
'assigns a reviewer to a single user'
do
_
,
explanations
=
service
.
explain
(
content
,
issuable
)
_
,
updates
,
message
=
service
.
execute
(
content
,
issuable
)
expect
(
updates
).
to
eq
(
reviewer_ids:
[
developer
.
id
])
expect
(
message
).
to
eq
(
"Assigned
#{
developer
.
to_reference
}
as reviewer."
)
expect
(
explanations
).
to
eq
([
"Assigns
#{
developer
.
to_reference
}
as reviewer."
])
end
end
shared_examples
'unassign_reviewer command'
do
it
'removes a single reviewer'
do
_
,
explanations
=
service
.
explain
(
content
,
issuable
)
_
,
updates
,
message
=
service
.
execute
(
content
,
issuable
)
expect
(
updates
).
to
eq
(
reviewer_ids:
[])
expect
(
message
).
to
eq
(
"Removed reviewer
#{
developer
.
to_reference
}
."
)
expect
(
explanations
).
to
eq
([
"Removes reviewer @
#{
developer
.
username
}
."
])
end
end
...
...
@@ -2009,6 +2005,28 @@ RSpec.describe QuickActions::InterpretService do
end
end
describe
'unassign_reviewer command'
do
let
(
:content
)
{
'/unassign_reviewer'
}
let
(
:merge_request
)
{
create
(
:merge_request
,
source_project:
project
,
reviewers:
[
developer
])
}
it
'includes current assignee reference'
do
_
,
explanations
=
service
.
explain
(
content
,
merge_request
)
expect
(
explanations
).
to
eq
([
"Removes reviewer @
#{
developer
.
username
}
."
])
end
end
describe
'assign_reviewer command'
do
let
(
:content
)
{
"/assign_reviewer
#{
developer
.
to_reference
}
"
}
let
(
:merge_request
)
{
create
(
:merge_request
,
source_project:
project
,
assignees:
[
developer
])
}
it
'includes only the user reference'
do
_
,
explanations
=
service
.
explain
(
content
,
merge_request
)
expect
(
explanations
).
to
eq
([
"Assigns
#{
developer
.
to_reference
}
as reviewer."
])
end
end
describe
'milestone command'
do
let
(
:content
)
{
'/milestone %wrong-milestone'
}
let!
(
:milestone
)
{
create
(
:milestone
,
project:
project
,
title:
'9.10'
)
}
...
...
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