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
0
Merge Requests
0
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
Léo-Paul Géneau
gitlab-ce
Commits
9f976548
Commit
9f976548
authored
Nov 28, 2018
by
Heinrich Lee Yu
Committed by
Heinrich Lee Yu
Dec 19, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Refactor sidebar to use data from serializer
parent
6c79e930
Changes
26
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
26 changed files
with
374 additions
and
242 deletions
+374
-242
app/assets/javascripts/right_sidebar.js
app/assets/javascripts/right_sidebar.js
+5
-4
app/controllers/concerns/issuable_actions.rb
app/controllers/concerns/issuable_actions.rb
+4
-6
app/controllers/projects/merge_requests/conflicts_controller.rb
...ntrollers/projects/merge_requests/conflicts_controller.rb
+7
-1
app/controllers/projects/merge_requests_controller.rb
app/controllers/projects/merge_requests_controller.rb
+2
-4
app/helpers/issuables_helper.rb
app/helpers/issuables_helper.rb
+33
-57
app/helpers/milestones_helper.rb
app/helpers/milestones_helper.rb
+0
-6
app/models/user.rb
app/models/user.rb
+4
-0
app/serializers/entity_date_helper.rb
app/serializers/entity_date_helper.rb
+10
-7
app/serializers/issuable_sidebar_entity.rb
app/serializers/issuable_sidebar_entity.rb
+103
-0
app/serializers/issuable_sidebar_todo_entity.rb
app/serializers/issuable_sidebar_todo_entity.rb
+11
-0
app/serializers/issue_serializer.rb
app/serializers/issue_serializer.rb
+3
-3
app/serializers/issue_sidebar_entity.rb
app/serializers/issue_sidebar_entity.rb
+5
-0
app/serializers/merge_request_serializer.rb
app/serializers/merge_request_serializer.rb
+3
-3
app/serializers/merge_request_sidebar_entity.rb
app/serializers/merge_request_sidebar_entity.rb
+7
-0
app/views/projects/issues/show.html.haml
app/views/projects/issues/show.html.haml
+1
-1
app/views/projects/merge_requests/conflicts/show.html.haml
app/views/projects/merge_requests/conflicts/show.html.haml
+1
-1
app/views/projects/merge_requests/show.html.haml
app/views/projects/merge_requests/show.html.haml
+2
-1
app/views/shared/issuable/_sidebar.html.haml
app/views/shared/issuable/_sidebar.html.haml
+83
-79
app/views/shared/issuable/_sidebar_assignees.html.haml
app/views/shared/issuable/_sidebar_assignees.html.haml
+32
-14
app/views/shared/issuable/_sidebar_todo.html.haml
app/views/shared/issuable/_sidebar_todo.html.haml
+20
-6
app/views/shared/issuable/form/_metadata.html.haml
app/views/shared/issuable/form/_metadata.html.haml
+1
-2
spec/controllers/projects/merge_requests_controller_spec.rb
spec/controllers/projects/merge_requests_controller_spec.rb
+0
-15
spec/helpers/issuables_helper_spec.rb
spec/helpers/issuables_helper_spec.rb
+5
-31
spec/serializers/entity_date_helper_spec.rb
spec/serializers/entity_date_helper_spec.rb
+26
-0
spec/serializers/merge_request_serializer_spec.rb
spec/serializers/merge_request_serializer_spec.rb
+1
-1
spec/views/projects/merge_requests/show.html.haml_spec.rb
spec/views/projects/merge_requests/show.html.haml_spec.rb
+5
-0
No files found.
app/assets/javascripts/right_sidebar.js
View file @
9f976548
...
@@ -79,11 +79,12 @@ Sidebar.prototype.sidebarToggleClicked = function(e, triggered) {
...
@@ -79,11 +79,12 @@ Sidebar.prototype.sidebarToggleClicked = function(e, triggered) {
Sidebar
.
prototype
.
toggleTodo
=
function
(
e
)
{
Sidebar
.
prototype
.
toggleTodo
=
function
(
e
)
{
var
$btnText
,
$this
,
$todoLoading
,
ajaxType
,
url
;
var
$btnText
,
$this
,
$todoLoading
,
ajaxType
,
url
;
$this
=
$
(
e
.
currentTarget
);
$this
=
$
(
e
.
currentTarget
);
ajaxType
=
$this
.
attr
(
'
data-delete-path
'
)
?
'
delete
'
:
'
post
'
;
ajaxType
=
$this
.
data
(
'
deletePath
'
)
?
'
delete
'
:
'
post
'
;
if
(
$this
.
attr
(
'
data-delete-path
'
))
{
url
=
''
+
$this
.
attr
(
'
data-delete-path
'
);
if
(
$this
.
data
(
'
deletePath
'
))
{
url
=
''
+
$this
.
data
(
'
deletePath
'
);
}
else
{
}
else
{
url
=
''
+
$this
.
data
(
'
url
'
);
url
=
''
+
$this
.
data
(
'
createPath
'
);
}
}
$this
.
tooltip
(
'
hide
'
);
$this
.
tooltip
(
'
hide
'
);
...
...
app/controllers/concerns/issuable_actions.rb
View file @
9f976548
...
@@ -5,7 +5,6 @@ module IssuableActions
...
@@ -5,7 +5,6 @@ module IssuableActions
include
Gitlab
::
Utils
::
StrongMemoize
include
Gitlab
::
Utils
::
StrongMemoize
included
do
included
do
before_action
:labels
,
only:
[
:show
,
:new
,
:edit
]
before_action
:authorize_destroy_issuable!
,
only: :destroy
before_action
:authorize_destroy_issuable!
,
only: :destroy
before_action
:authorize_admin_issuable!
,
only: :bulk_update
before_action
:authorize_admin_issuable!
,
only: :bulk_update
end
end
...
@@ -25,7 +24,10 @@ module IssuableActions
...
@@ -25,7 +24,10 @@ module IssuableActions
def
show
def
show
respond_to
do
|
format
|
respond_to
do
|
format
|
format
.
html
format
.
html
do
@issuable_sidebar
=
serializer
.
represent
(
issuable
,
serializer:
'sidebar'
)
# rubocop:disable Gitlab/ModuleWithInstanceVariables
end
format
.
json
do
format
.
json
do
render
json:
serializer
.
represent
(
issuable
,
serializer:
params
[
:serializer
])
render
json:
serializer
.
represent
(
issuable
,
serializer:
params
[
:serializer
])
end
end
...
@@ -168,10 +170,6 @@ module IssuableActions
...
@@ -168,10 +170,6 @@ module IssuableActions
end
end
end
end
def
labels
@labels
||=
LabelsFinder
.
new
(
current_user
,
project_id:
@project
.
id
).
execute
# rubocop:disable Gitlab/ModuleWithInstanceVariables
end
def
authorize_destroy_issuable!
def
authorize_destroy_issuable!
unless
can?
(
current_user
,
:"destroy_
#{
issuable
.
to_ability_name
}
"
,
issuable
)
unless
can?
(
current_user
,
:"destroy_
#{
issuable
.
to_ability_name
}
"
,
issuable
)
return
access_denied!
return
access_denied!
...
...
app/controllers/projects/merge_requests/conflicts_controller.rb
View file @
9f976548
...
@@ -8,7 +8,7 @@ class Projects::MergeRequests::ConflictsController < Projects::MergeRequests::Ap
...
@@ -8,7 +8,7 @@ class Projects::MergeRequests::ConflictsController < Projects::MergeRequests::Ap
def
show
def
show
respond_to
do
|
format
|
respond_to
do
|
format
|
format
.
html
do
format
.
html
do
labels
@issuable_sidebar
=
serializer
.
represent
(
@merge_request
,
serializer:
'sidebar'
)
end
end
format
.
json
do
format
.
json
do
...
@@ -60,9 +60,15 @@ class Projects::MergeRequests::ConflictsController < Projects::MergeRequests::Ap
...
@@ -60,9 +60,15 @@ class Projects::MergeRequests::ConflictsController < Projects::MergeRequests::Ap
end
end
end
end
private
def
authorize_can_resolve_conflicts!
def
authorize_can_resolve_conflicts!
@conflicts_list
=
::
MergeRequests
::
Conflicts
::
ListService
.
new
(
@merge_request
)
@conflicts_list
=
::
MergeRequests
::
Conflicts
::
ListService
.
new
(
@merge_request
)
return
render_404
unless
@conflicts_list
.
can_be_resolved_by?
(
current_user
)
return
render_404
unless
@conflicts_list
.
can_be_resolved_by?
(
current_user
)
end
end
def
serializer
MergeRequestSerializer
.
new
(
current_user:
current_user
,
project:
merge_request
.
project
)
end
end
end
app/controllers/projects/merge_requests_controller.rb
View file @
9f976548
...
@@ -22,8 +22,7 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo
...
@@ -22,8 +22,7 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo
format
.
html
format
.
html
format
.
json
do
format
.
json
do
render
json:
{
render
json:
{
html:
view_to_html_string
(
"projects/merge_requests/_merge_requests"
),
html:
view_to_html_string
(
"projects/merge_requests/_merge_requests"
)
labels:
@labels
.
as_json
(
methods: :text_color
)
}
}
end
end
end
end
...
@@ -43,8 +42,7 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo
...
@@ -43,8 +42,7 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo
@noteable
=
@merge_request
@noteable
=
@merge_request
@commits_count
=
@merge_request
.
commits_count
@commits_count
=
@merge_request
.
commits_count
@issuable_sidebar
=
serializer
.
represent
(
@merge_request
,
serializer:
'sidebar'
)
labels
set_pipeline_variables
set_pipeline_variables
...
...
app/helpers/issuables_helper.rb
View file @
9f976548
...
@@ -23,23 +23,36 @@ module IssuablesHelper
...
@@ -23,23 +23,36 @@ module IssuablesHelper
end
end
end
end
def
sidebar_
due_date_tooltip_label
(
issuabl
e
)
def
sidebar_
milestone_tooltip_label
(
mileston
e
)
if
issuable
.
due_date
if
milestone
&&
milestone
[
:due_date
]
"
#{
_
(
'Due date'
)
}
<br />
#{
due_date_remaining_days
(
issuabl
e
)
}
"
"
#{
milestone
[
:title
]
}
<br/>
#{
sidebar_milestone_remaining_days
(
mileston
e
)
}
"
else
else
_
(
'
Due date'
)
_
(
'
Milestone'
)
+
(
milestone
?
"<br/>
#{
milestone
[
:title
]
}
"
:
""
)
end
end
end
end
def
due_date_remaining_days
(
issuable
)
def
sidebar_milestone_remaining_days
(
milestone
)
remaining_days_in_words
=
remaining_days_in_words
(
issuable
)
due_date_remaining_days
(
due_date:
milestone
[
:due_date
],
start_date:
milestone
[
:start_date
])
if
milestone
[
:due_date
]
end
def
sidebar_due_date_tooltip_label
(
due_date
)
_
(
'Due date'
)
+
(
due_date
?
"<br/>
#{
due_date_remaining_days
(
due_date
)
}
"
:
""
)
end
def
due_date_remaining_days
(
due_date
,
start_date
=
nil
)
"
#{
due_date
.
to_s
(
:medium
)
}
(
#{
remaining_days_in_words
(
due_date:
due_date
,
start_date:
start_date
)
}
)"
end
def
sidebar_label_filter_path
(
base_path
,
label_name
)
query_params
=
{
label_name:
[
label_name
]}.
to_query
"
#{
issuable
.
due_date
.
to_s
(
:medium
)
}
(
#{
remaining_days_in_words
}
)
"
"
#{
base_path
}
?
#{
query_params
}
"
end
end
def
multi_label_name
(
current_labels
,
default_label
)
def
multi_label_name
(
current_labels
,
default_label
)
if
current_labels
&&
current_labels
.
any?
if
current_labels
&&
current_labels
.
any?
title
=
current_labels
.
first
.
try
(
:title
)
title
=
current_labels
.
first
.
try
(
:title
)
||
current_labels
.
first
[
:title
]
if
current_labels
.
size
>
1
if
current_labels
.
size
>
1
"
#{
title
}
+
#{
current_labels
.
size
-
1
}
more"
"
#{
title
}
+
#{
current_labels
.
size
-
1
}
more"
else
else
...
@@ -50,13 +63,13 @@ module IssuablesHelper
...
@@ -50,13 +63,13 @@ module IssuablesHelper
end
end
end
end
def
issuable_json_path
(
issuable
,
url_params
=
{}
)
def
issuable_json_path
(
issuable
)
project
=
issuable
.
project
project
=
issuable
.
project
if
issuable
.
is_a?
(
MergeRequest
)
if
issuable
.
is_a?
(
MergeRequest
)
project_merge_request_path
(
project
,
issuable
.
iid
,
:json
,
url_params
)
project_merge_request_path
(
project
,
issuable
.
iid
,
:json
)
else
else
project_issue_path
(
project
,
issuable
.
iid
,
:json
,
url_params
)
project_issue_path
(
project
,
issuable
.
iid
,
:json
)
end
end
end
end
...
@@ -197,19 +210,11 @@ module IssuablesHelper
...
@@ -197,19 +210,11 @@ module IssuablesHelper
output
.
join
.
html_safe
output
.
join
.
html_safe
end
end
# rubocop: disable CodeReuse/ActiveRecord
def
issuable_todo
(
issuable
)
if
current_user
current_user
.
todos
.
find_by
(
target:
issuable
,
state: :pending
)
end
end
# rubocop: enable CodeReuse/ActiveRecord
def
issuable_labels_tooltip
(
labels
,
limit:
5
)
def
issuable_labels_tooltip
(
labels
,
limit:
5
)
first
,
last
=
labels
.
partition
.
with_index
{
|
_
,
i
|
i
<
limit
}
first
,
last
=
labels
.
partition
.
with_index
{
|
_
,
i
|
i
<
limit
}
if
labels
&&
labels
.
any?
if
labels
&&
labels
.
any?
label_names
=
first
.
collect
(
&
:name
)
label_names
=
first
.
collect
{
|
l
|
l
[
:title
]
}
label_names
<<
"and
#{
last
.
size
}
more"
unless
last
.
empty?
label_names
<<
"and
#{
last
.
size
}
more"
unless
last
.
empty?
label_names
.
join
(
', '
)
label_names
.
join
(
', '
)
...
@@ -356,12 +361,6 @@ module IssuablesHelper
...
@@ -356,12 +361,6 @@ module IssuablesHelper
issuable
.
model_name
.
human
.
downcase
issuable
.
model_name
.
human
.
downcase
end
end
def
selected_labels
Array
(
params
[
:label_name
]).
map
do
|
label_name
|
Label
.
new
(
title:
label_name
)
end
end
def
has_filter_bar_param?
def
has_filter_bar_param?
finder
.
class
.
scalar_params
.
any?
{
|
p
|
params
[
p
].
present?
}
finder
.
class
.
scalar_params
.
any?
{
|
p
|
params
[
p
].
present?
}
end
end
...
@@ -386,22 +385,6 @@ module IssuablesHelper
...
@@ -386,22 +385,6 @@ module IssuablesHelper
params
[
:issuable_template
]
if
issuable_templates
(
issuable
).
any?
{
|
template
|
template
[
:name
]
==
params
[
:issuable_template
]
}
params
[
:issuable_template
]
if
issuable_templates
(
issuable
).
any?
{
|
template
|
template
[
:name
]
==
params
[
:issuable_template
]
}
end
end
def
issuable_todo_button_data
(
issuable
,
todo
,
is_collapsed
)
{
todo_text:
"Add todo"
,
mark_text:
"Mark todo as done"
,
todo_icon:
(
is_collapsed
?
sprite_icon
(
'todo-add'
)
:
nil
),
mark_icon:
(
is_collapsed
?
sprite_icon
(
'todo-done'
,
css_class:
'todo-undone'
)
:
nil
),
issuable_id:
issuable
.
id
,
issuable_type:
issuable
.
class
.
name
.
underscore
,
url:
project_todos_path
(
@project
),
delete_path:
(
dashboard_todo_path
(
todo
)
if
todo
),
placement:
(
is_collapsed
?
'left'
:
nil
),
container:
(
is_collapsed
?
'body'
:
nil
),
boundary:
'viewport'
}
end
def
close_reopen_params
(
issuable
,
action
)
def
close_reopen_params
(
issuable
,
action
)
{
{
issuable
.
model_name
.
to_s
.
underscore
=>
{
state_event:
action
}
issuable
.
model_name
.
to_s
.
underscore
=>
{
state_event:
action
}
...
@@ -418,27 +401,20 @@ module IssuablesHelper
...
@@ -418,27 +401,20 @@ module IssuablesHelper
end
end
end
end
def
issuable_sidebar_options
(
issuable
,
can_edit_issuable
)
def
issuable_sidebar_options
(
sidebar_data
)
{
{
endpoint:
issuable_json_path
(
issuable
,
serializer:
'sidebar_extras'
)
,
endpoint:
"
#{
sidebar_data
[
:issuable_json_path
]
}
?serializer=sidebar_extras"
,
toggleSubscriptionEndpoint:
toggle_subscription_path
(
issuable
)
,
toggleSubscriptionEndpoint:
sidebar_data
[
:toggle_subscription_path
]
,
moveIssueEndpoint:
move_namespace_project_issue_path
(
namespace_id:
issuable
.
project
.
namespace
.
to_param
,
project_id:
issuable
.
project
,
id:
issuable
)
,
moveIssueEndpoint:
sidebar_data
[
:move_issue_path
]
,
projectsAutocompleteEndpoint:
autocomplete_projects_path
(
project_id:
@project
.
id
)
,
projectsAutocompleteEndpoint:
sidebar_data
[
:projects_autocomplete_path
]
,
editable:
can_edit_issuable
,
editable:
sidebar_data
[
:can_edit
]
,
currentUser:
UserSerializer
.
new
.
represent
(
current_user
)
,
currentUser:
sidebar_data
[
:current_user
]
,
rootPath:
root_path
,
rootPath:
root_path
,
fullPath:
@project
.
full_path
fullPath:
sidebar_data
[
:project_full_path
]
}
}
end
end
def
parent
def
parent
@project
||
@group
@project
||
@group
end
end
def
issuable_milestone_tooltip_title
(
issuable
)
if
issuable
.
milestone
milestone_tooltip
=
milestone_tooltip_title
(
issuable
.
milestone
)
_
(
'Milestone'
)
+
(
milestone_tooltip
?
': '
+
milestone_tooltip
:
''
)
end
end
end
end
app/helpers/milestones_helper.rb
View file @
9f976548
...
@@ -114,12 +114,6 @@ module MilestonesHelper
...
@@ -114,12 +114,6 @@ module MilestonesHelper
end
end
end
end
def
milestone_tooltip_title
(
milestone
)
if
milestone
"
#{
milestone
.
title
}
<br />
#{
milestone_tooltip_due_date
(
milestone
)
}
"
end
end
def
milestone_time_for
(
date
,
date_type
)
def
milestone_time_for
(
date
,
date_type
)
title
=
date_type
==
:start
?
"Start date"
:
"End date"
title
=
date_type
==
:start
?
"Start date"
:
"End date"
...
...
app/models/user.rb
View file @
9f976548
...
@@ -1422,6 +1422,10 @@ class User < ActiveRecord::Base
...
@@ -1422,6 +1422,10 @@ class User < ActiveRecord::Base
todos
.
where
(
id:
ids
)
todos
.
where
(
id:
ids
)
end
end
def
pending_todo_for
(
target
)
todos
.
find_by
(
target:
target
,
state: :pending
)
end
# @deprecated
# @deprecated
alias_method
:owned_or_masters_groups
,
:owned_or_maintainers_groups
alias_method
:owned_or_masters_groups
,
:owned_or_maintainers_groups
...
...
app/serializers/entity_date_helper.rb
View file @
9f976548
...
@@ -45,13 +45,16 @@ module EntityDateHelper
...
@@ -45,13 +45,16 @@ module EntityDateHelper
# If due date is provided, it returns "# days|weeks|months remaining|ago"
# If due date is provided, it returns "# days|weeks|months remaining|ago"
# If start date is provided and elapsed, with no due date, it returns "# days elapsed"
# If start date is provided and elapsed, with no due date, it returns "# days elapsed"
def
remaining_days_in_words
(
entity
)
def
remaining_days_in_words
(
entity
)
if
entity
.
try
(
:expired?
)
start_date
=
entity
.
try
(
:start_date
)
||
entity
.
try
(
:[]
,
:start_date
)
due_date
=
entity
.
try
(
:due_date
)
||
entity
.
try
(
:[]
,
:due_date
)
if
due_date
&&
due_date
.
past?
content_tag
(
:strong
,
'Past due'
)
content_tag
(
:strong
,
'Past due'
)
elsif
entity
.
try
(
:upcoming?
)
elsif
start_date
&&
start_date
.
future?
content_tag
(
:strong
,
'Upcoming'
)
content_tag
(
:strong
,
'Upcoming'
)
elsif
entity
.
due_date
elsif
due_date
is_upcoming
=
(
entity
.
due_date
-
Date
.
today
).
to_i
>
0
is_upcoming
=
(
due_date
-
Date
.
today
).
to_i
>
0
time_ago
=
time_ago_in_words
(
entity
.
due_date
)
time_ago
=
time_ago_in_words
(
due_date
)
# https://gitlab.com/gitlab-org/gitlab-ce/issues/49440
# https://gitlab.com/gitlab-org/gitlab-ce/issues/49440
#
#
...
@@ -63,8 +66,8 @@ module EntityDateHelper
...
@@ -63,8 +66,8 @@ module EntityDateHelper
remaining_or_ago
=
is_upcoming
?
_
(
"remaining"
)
:
_
(
"ago"
)
remaining_or_ago
=
is_upcoming
?
_
(
"remaining"
)
:
_
(
"ago"
)
"
#{
content
}
#{
remaining_or_ago
}
"
.
html_safe
"
#{
content
}
#{
remaining_or_ago
}
"
.
html_safe
elsif
entity
.
start_date
&&
entity
.
start_date
.
past?
elsif
start_date
&&
start_date
.
past?
days
=
entity
.
elapsed_days
days
=
(
Date
.
today
-
start_date
).
to_i
"
#{
content_tag
(
:strong
,
days
)
}
#{
'day'
.
pluralize
(
days
)
}
elapsed"
.
html_safe
"
#{
content_tag
(
:strong
,
days
)
}
#{
'day'
.
pluralize
(
days
)
}
elapsed"
.
html_safe
end
end
end
end
...
...
app/serializers/issuable_sidebar_entity.rb
View file @
9f976548
...
@@ -3,6 +3,109 @@
...
@@ -3,6 +3,109 @@
class
IssuableSidebarEntity
<
Grape
::
Entity
class
IssuableSidebarEntity
<
Grape
::
Entity
include
RequestAwareEntity
include
RequestAwareEntity
with_options
if:
{
include_basic:
true
}
do
expose
:id
expose
:type
do
|
issuable
|
issuable
.
to_ability_name
end
expose
:author_id
expose
:project_id
do
|
issuable
|
issuable
.
project
.
id
end
expose
:discussion_locked?
,
as: :discussion_locked
expose
:reference
do
|
issuable
|
issuable
.
to_reference
(
issuable
.
project
,
full:
true
)
end
expose
:current_user
,
using:
UserEntity
do
|
issuable
|
request
.
current_user
end
# Relationships
expose
:todo
,
using:
IssuableSidebarTodoEntity
do
|
issuable
|
request
.
current_user
.
pending_todo_for
(
issuable
)
if
request
.
current_user
end
expose
:milestone
,
using:
::
API
::
Entities
::
Milestone
expose
:labels
,
using:
LabelEntity
# Permissions
expose
:signed_in
do
|
issuable
|
request
.
current_user
.
present?
end
expose
:can_edit
do
|
issuable
|
can?
(
request
.
current_user
,
:"admin_
#{
issuable
.
to_ability_name
}
"
,
issuable
.
project
)
end
expose
:can_move
do
|
issuable
|
request
.
current_user
&&
issuable
.
can_move?
(
request
.
current_user
)
end
expose
:can_admin_label
do
|
issuable
|
can?
(
request
.
current_user
,
:admin_label
,
issuable
.
project
)
end
# Paths
expose
:issuable_json_path
do
|
issuable
|
if
issuable
.
is_a?
(
MergeRequest
)
project_merge_request_path
(
issuable
.
project
,
issuable
.
iid
,
:json
)
else
project_issue_path
(
issuable
.
project
,
issuable
.
iid
,
:json
)
end
end
expose
:namespace_path
do
|
issuable
|
issuable
.
project
.
namespace
.
full_path
end
expose
:project_path
do
|
issuable
|
issuable
.
project
.
path
end
expose
:project_full_path
do
|
issuable
|
issuable
.
project
.
full_path
end
expose
:project_issuables_path
do
|
issuable
|
project
=
issuable
.
project
namespace
=
project
.
namespace
if
issuable
.
is_a?
(
MergeRequest
)
namespace_project_merge_requests_path
(
namespace
,
project
)
else
namespace_project_issues_path
(
namespace
,
project
)
end
end
expose
:create_todo_path
do
|
issuable
|
project_todos_path
(
issuable
.
project
)
end
expose
:project_milestones_path
do
|
issuable
|
project_milestones_path
(
issuable
.
project
,
:json
)
end
expose
:project_labels_path
do
|
issuable
|
project_labels_path
(
issuable
.
project
,
:json
,
include_ancestor_groups:
true
)
end
expose
:toggle_subscription_path
do
|
issuable
|
toggle_subscription_path
(
issuable
)
end
expose
:move_issue_path
do
|
issuable
|
move_namespace_project_issue_path
(
namespace_id:
issuable
.
project
.
namespace
.
to_param
,
project_id:
issuable
.
project
,
id:
issuable
)
end
expose
:projects_autocomplete_path
do
|
issuable
|
autocomplete_projects_path
(
project_id:
issuable
.
project
.
id
)
end
end
with_options
if:
{
include_extras:
true
}
do
with_options
if:
{
include_extras:
true
}
do
include
TimeTrackableEntity
include
TimeTrackableEntity
...
...
app/serializers/issuable_sidebar_todo_entity.rb
0 → 100644
View file @
9f976548
# frozen_string_literal: true
class
IssuableSidebarTodoEntity
<
Grape
::
Entity
include
Gitlab
::
Routing
expose
:id
expose
:delete_path
do
|
todo
|
dashboard_todo_path
(
todo
)
if
todo
end
end
app/serializers/issue_serializer.rb
View file @
9f976548
...
@@ -7,9 +7,9 @@ class IssueSerializer < BaseSerializer
...
@@ -7,9 +7,9 @@ class IssueSerializer < BaseSerializer
def
represent
(
issue
,
opts
=
{})
def
represent
(
issue
,
opts
=
{})
entity
=
entity
=
case
opts
[
:serializer
]
case
opts
[
:serializer
]
when
'sidebar_extras'
when
'sidebar
'
,
'sidebar
_extras'
opts
[
:include_basic
]
=
false
opts
[
:include_basic
]
=
(
opts
[
:serializer
]
==
'sidebar'
)
opts
[
:include_extras
]
=
true
opts
[
:include_extras
]
=
(
opts
[
:serializer
]
==
'sidebar_extras'
)
IssueSidebarEntity
IssueSidebarEntity
when
'board'
when
'board'
IssueBoardEntity
IssueBoardEntity
...
...
app/serializers/issue_sidebar_entity.rb
View file @
9f976548
# frozen_string_literal: true
# frozen_string_literal: true
class
IssueSidebarEntity
<
IssuableSidebarEntity
class
IssueSidebarEntity
<
IssuableSidebarEntity
with_options
if:
{
include_basic:
true
}
do
expose
:due_date
expose
:confidential
end
with_options
if:
{
include_extras:
true
}
do
with_options
if:
{
include_extras:
true
}
do
expose
:assignees
,
using:
API
::
Entities
::
UserBasic
expose
:assignees
,
using:
API
::
Entities
::
UserBasic
end
end
...
...
app/serializers/merge_request_serializer.rb
View file @
9f976548
...
@@ -7,9 +7,9 @@ class MergeRequestSerializer < BaseSerializer
...
@@ -7,9 +7,9 @@ class MergeRequestSerializer < BaseSerializer
def
represent
(
merge_request
,
opts
=
{})
def
represent
(
merge_request
,
opts
=
{})
entity
=
entity
=
case
opts
[
:serializer
]
case
opts
[
:serializer
]
when
'sidebar_extras'
when
'sidebar
'
,
'sidebar
_extras'
opts
[
:include_basic
]
=
false
opts
[
:include_basic
]
=
(
opts
[
:serializer
]
==
'sidebar'
)
opts
[
:include_extras
]
=
true
opts
[
:include_extras
]
=
(
opts
[
:serializer
]
==
'sidebar_extras'
)
MergeRequestSidebarEntity
MergeRequestSidebarEntity
when
'basic'
when
'basic'
MergeRequestBasicEntity
MergeRequestBasicEntity
...
...
app/serializers/merge_request_sidebar_entity.rb
View file @
9f976548
# frozen_string_literal: true
# frozen_string_literal: true
class
MergeRequestSidebarEntity
<
IssuableSidebarEntity
class
MergeRequestSidebarEntity
<
IssuableSidebarEntity
with_options
if:
{
include_basic:
true
}
do
expose
:assignee
,
using:
API
::
Entities
::
UserBasic
expose
:can_merge
do
|
issuable
|
issuable
.
can_be_merged_by?
(
issuable
.
assignee
)
if
issuable
.
assignee
end
end
end
end
app/views/projects/issues/show.html.haml
View file @
9f976548
...
@@ -88,4 +88,4 @@
...
@@ -88,4 +88,4 @@
%section
.issuable-discussion
%section
.issuable-discussion
=
render
'projects/issues/discussion'
=
render
'projects/issues/discussion'
=
render
'shared/issuable/sidebar'
,
issuable:
@issue
=
render
'shared/issuable/sidebar'
,
issuable:
@issue
,
issuable_sidebar:
@issuable_sidebar
app/views/projects/merge_requests/conflicts/show.html.haml
View file @
9f976548
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
.merge-request-details.issuable-details
.merge-request-details.issuable-details
=
render
"projects/merge_requests/mr_box"
=
render
"projects/merge_requests/mr_box"
=
render
'shared/issuable/sidebar'
,
issuable:
@merge_request
=
render
'shared/issuable/sidebar'
,
issuable:
@merge_request
,
issuable_sidebar:
@issuable_sidebar
#conflicts
{
"v-cloak"
=>
"true"
,
data:
{
conflicts_path:
conflicts_project_merge_request_path
(
@merge_request
.
project
,
@merge_request
,
format: :json
),
#conflicts
{
"v-cloak"
=>
"true"
,
data:
{
conflicts_path:
conflicts_project_merge_request_path
(
@merge_request
.
project
,
@merge_request
,
format: :json
),
resolve_conflicts_path:
resolve_conflicts_project_merge_request_path
(
@merge_request
.
project
,
@merge_request
)
}
}
resolve_conflicts_path:
resolve_conflicts_project_merge_request_path
(
@merge_request
.
project
,
@merge_request
)
}
}
...
...
app/views/projects/merge_requests/show.html.haml
View file @
9f976548
...
@@ -86,7 +86,8 @@
...
@@ -86,7 +86,8 @@
.mr-loading-status
.mr-loading-status
=
spinner
=
spinner
=
render
'shared/issuable/sidebar'
,
issuable:
@merge_request
=
render
'shared/issuable/sidebar'
,
issuable:
@merge_request
,
issuable_sidebar:
@issuable_sidebar
-
if
@merge_request
.
can_be_reverted?
(
current_user
)
-
if
@merge_request
.
can_be_reverted?
(
current_user
)
=
render
"projects/commit/change"
,
type:
'revert'
,
commit:
@merge_request
.
merge_commit
,
title:
@merge_request
.
title
=
render
"projects/commit/change"
,
type:
'revert'
,
commit:
@merge_request
.
merge_commit
,
title:
@merge_request
.
title
-
if
@merge_request
.
can_be_cherry_picked?
-
if
@merge_request
.
can_be_cherry_picked?
...
...
app/views/shared/issuable/_sidebar.html.haml
View file @
9f976548
This diff is collapsed.
Click to expand it.
app/views/shared/issuable/_sidebar_assignees.html.haml
View file @
9f976548
-
if
issuable
.
is_a?
(
Issue
)
-
issuable_type
=
issuable_sidebar
[
:type
]
#js-vue-sidebar-assignees
{
data:
{
field:
"#{issuable.to_ability_name}[assignee_ids]"
,
signed_in:
signed_in
}
}
-
signed_in
=
issuable_sidebar
[
:signed_in
]
-
can_edit_issuable
=
issuable_sidebar
[
:can_edit
]
-
if
issuable_type
==
"issue"
#js-vue-sidebar-assignees
{
data:
{
field:
"#{issuable_type}[assignee_ids]"
,
signed_in:
signed_in
}
}
.title.hide-collapsed
.title.hide-collapsed
=
_
(
'Assignee'
)
=
_
(
'Assignee'
)
=
icon
(
'spinner spin'
)
=
icon
(
'spinner spin'
)
-
else
-
else
.sidebar-collapsed-icon.sidebar-collapsed-user
{
data:
{
toggle:
"tooltip"
,
placement:
"left"
,
container:
"body"
,
boundary:
'viewport'
},
title:
sidebar_assignee_tooltip_label
(
issuable
)
}
.sidebar-collapsed-icon.sidebar-collapsed-user
{
data:
{
toggle:
"tooltip"
,
placement:
"left"
,
container:
"body"
,
boundary:
'viewport'
},
title:
(
issuable_sidebar
.
dig
(
:assignee
,
:name
)
||
_
(
'Assignee'
)
)
}
-
if
issuable
.
assignee
-
if
issuable
_sidebar
[
:assignee
]
=
link_to_member
(
@project
,
issuable
.
assignee
,
size:
24
)
=
link_to_member
(
@project
,
issuable
.
assignee
,
size:
24
)
-
else
-
else
=
icon
(
'user'
,
'aria-hidden'
:
'true'
)
=
icon
(
'user'
,
'aria-hidden'
:
'true'
)
...
@@ -18,13 +22,13 @@
...
@@ -18,13 +22,13 @@
%a
.gutter-toggle.float-right.js-sidebar-toggle
{
role:
"button"
,
href:
"#"
,
"aria-label"
=>
_
(
'Toggle sidebar'
)
}
%a
.gutter-toggle.float-right.js-sidebar-toggle
{
role:
"button"
,
href:
"#"
,
"aria-label"
=>
_
(
'Toggle sidebar'
)
}
=
sidebar_gutter_toggle_icon
=
sidebar_gutter_toggle_icon
.value.hide-collapsed
.value.hide-collapsed
-
if
issuable
.
assignee
-
if
issuable
_sidebar
[
:assignee
]
=
link_to_member
(
@project
,
issuable
.
assignee
,
size:
32
,
extra_class:
'bold'
)
do
=
link_to_member
(
@project
,
issuable
.
assignee
,
size:
32
,
extra_class:
'bold'
)
do
-
if
!
issuable
.
can_be_merged_by?
(
issuable
.
assignee
)
-
if
issuable_sidebar
[
:can_merge
]
%span
.float-right.cannot-be-merged
{
data:
{
toggle:
'tooltip'
,
placement:
'left'
},
title:
_
(
'Not allowed to merge'
)
}
%span
.float-right.cannot-be-merged
{
data:
{
toggle:
'tooltip'
,
placement:
'left'
},
title:
_
(
'Not allowed to merge'
)
}
=
icon
(
'exclamation-triangle'
,
'aria-hidden'
:
'true'
)
=
icon
(
'exclamation-triangle'
,
'aria-hidden'
:
'true'
)
%span
.username
%span
.username
=
issuable
.
assignee
.
to_reference
@
#{
issuable_sidebar
[
:assignee
][
:username
]
}
-
else
-
else
%span
.assign-yourself.no-value
%span
.assign-yourself.no-value
=
_
(
'No assignee'
)
=
_
(
'No assignee'
)
...
@@ -34,19 +38,33 @@
...
@@ -34,19 +38,33 @@
=
_
(
'assign yourself'
)
=
_
(
'assign yourself'
)
.selectbox.hide-collapsed
.selectbox.hide-collapsed
-
if
issuable
.
assignees
.
none?
=
hidden_field_tag
"
#{
issuable_type
}
[assignee_ids][]"
,
0
,
id:
nil
-
else
-
issuable
.
assignees
.
each
do
|
assignee
|
-
issuable
.
assignees
.
each
do
|
assignee
|
=
hidden_field_tag
"
#{
issuable
.
to_ability_nam
e
}
[assignee_ids][]"
,
assignee
.
id
,
id:
nil
,
data:
{
avatar_url:
assignee
.
avatar_url
,
name:
assignee
.
name
,
username:
assignee
.
username
}
=
hidden_field_tag
"
#{
issuable_typ
e
}
[assignee_ids][]"
,
assignee
.
id
,
id:
nil
,
data:
{
avatar_url:
assignee
.
avatar_url
,
name:
assignee
.
name
,
username:
assignee
.
username
}
-
options
=
{
toggle_class:
'js-user-search js-author-search'
,
title:
_
(
'Assign to'
),
filter:
true
,
dropdown_class:
'dropdown-menu-user dropdown-menu-selectable dropdown-menu-author'
,
placeholder:
_
(
'Search users'
),
data:
{
first_user:
current_user
&
.
username
,
current_user:
true
,
project_id:
@project
&
.
id
,
author_id:
issuable
.
author_id
,
field_name:
"
#{
issuable
.
to_ability_name
}
[assignee_ids][]"
,
issue_update:
issuable_json_path
(
issuable
),
ability_name:
issuable
.
to_ability_name
,
null_user:
true
,
display:
'static'
}
}
-
options
=
{
toggle_class:
'js-user-search js-author-search'
,
title:
_
(
'Assign to'
),
filter:
true
,
dropdown_class:
'dropdown-menu-user dropdown-menu-selectable dropdown-menu-author'
,
placeholder:
_
(
'Search users'
),
data:
{
first_user:
issuable_sidebar
.
dig
(
:current_user
,
:username
),
current_user:
true
,
project_id:
issuable_sidebar
[
:project_id
],
author_id:
issuable_sidebar
[
:author_id
],
field_name:
"
#{
issuable_type
}
[assignee_ids][]"
,
issue_update:
issuable_sidebar
[
:issuable_json_path
],
ability_name:
issuable_type
,
null_user:
true
,
display:
'static'
}
}
-
title
=
_
(
'Select assignee'
)
-
title
=
_
(
'Select assignee'
)
-
if
issuable
.
is_a?
(
Issue
)
-
if
issuable_type
==
"issue"
-
unless
issuable
.
assignees
.
any?
=
hidden_field_tag
"
#{
issuable
.
to_ability_name
}
[assignee_ids][]"
,
0
,
id:
nil
-
dropdown_options
=
issue_assignees_dropdown_options
-
dropdown_options
=
issue_assignees_dropdown_options
-
title
=
dropdown_options
[
:title
]
-
title
=
dropdown_options
[
:title
]
-
options
[
:toggle_class
]
+=
' js-multiselect js-save-user-data'
-
options
[
:toggle_class
]
+=
' js-multiselect js-save-user-data'
-
data
=
{
field_name:
"
#{
issuable
.
to_ability_nam
e
}
[assignee_ids][]"
}
-
data
=
{
field_name:
"
#{
issuable
_typ
e
}
[assignee_ids][]"
}
-
data
[
:multi_select
]
=
true
-
data
[
:multi_select
]
=
true
-
data
[
'dropdown-title'
]
=
title
-
data
[
'dropdown-title'
]
=
title
-
data
[
'dropdown-header'
]
=
dropdown_options
[
:data
][
:'dropdown-header'
]
-
data
[
'dropdown-header'
]
=
dropdown_options
[
:data
][
:'dropdown-header'
]
...
...
app/views/shared/issuable/_sidebar_todo.html.haml
View file @
9f976548
-
is_collapsed
=
local_assigns
.
fetch
(
:is_collapsed
,
false
)
-
is_collapsed
=
local_assigns
.
fetch
(
:is_collapsed
,
false
)
-
mark_content
=
is_collapsed
?
sprite_icon
(
'todo-done'
,
css_class:
'todo-undone'
)
:
_
(
'Mark todo as done'
)
-
todo
=
issuable_sidebar
[
:todo
]
||
{}
-
todo_content
=
is_collapsed
?
sprite_icon
(
'todo-add'
)
:
_
(
'Add todo'
)
-
todo_text
=
_
(
'Add todo'
)
-
mark_text
=
_
(
'Mark todo as done'
)
-
todo_icon
=
sprite_icon
(
'todo-add'
)
-
mark_icon
=
sprite_icon
(
'todo-done'
,
css_class:
'todo-undone'
)
-
mark_content
=
is_collapsed
?
mark_icon
:
mark_text
-
todo_content
=
is_collapsed
?
todo_icon
:
todo_text
%button
.issuable-todo-btn.js-issuable-todo
{
type:
'button'
,
%button
.issuable-todo-btn.js-issuable-todo
{
type:
'button'
,
class:
(
is_collapsed
?
'btn-blank sidebar-collapsed-icon dont-change-state has-tooltip'
:
'btn btn-default issuable-header-btn float-right'
),
class:
(
is_collapsed
?
'btn-blank sidebar-collapsed-icon dont-change-state has-tooltip'
:
'btn btn-default issuable-header-btn float-right'
),
title:
(
todo
.
nil?
?
_
(
'Add todo'
)
:
_
(
'Mark todo as done'
)),
title:
(
todo
[
:id
]
?
mark_text
:
todo_text
),
'aria-label'
=>
(
todo
.
nil?
?
_
(
'Add todo'
)
:
_
(
'Mark todo as done'
)),
'aria-label'
=>
(
todo
[
:id
]
?
mark_text
:
todo_text
),
data:
issuable_todo_button_data
(
issuable
,
todo
,
is_collapsed
)
}
data:
{
todo_text:
todo_text
,
mark_text:
mark_text
,
todo_icon:
is_collapsed
?
todo_icon
:
nil
,
mark_icon:
is_collapsed
?
mark_icon
:
nil
,
issuable_id:
issuable_sidebar
[
:id
],
issuable_type:
issuable_sidebar
[
:type
],
create_path:
issuable_sidebar
[
:create_todo_path
],
delete_path:
todo
[
:delete_path
]
}
}
%span
.issuable-todo-inner.js-issuable-todo-inner
<
%span
.issuable-todo-inner.js-issuable-todo-inner
<
-
if
todo
-
if
todo
[
:id
]
=
mark_content
=
mark_content
-
else
-
else
=
todo_content
=
todo_content
...
...
app/views/shared/issuable/form/_metadata.html.haml
View file @
9f976548
...
@@ -19,10 +19,9 @@
...
@@ -19,10 +19,9 @@
.issuable-form-select-holder
.issuable-form-select-holder
=
render
"shared/issuable/milestone_dropdown"
,
selected:
issuable
.
milestone
,
name:
"
#{
issuable
.
class
.
model_name
.
param_key
}
[milestone_id]"
,
show_any:
false
,
show_upcoming:
false
,
show_started:
false
,
extra_class:
"qa-issuable-milestone-dropdown js-issuable-form-dropdown js-dropdown-keep-input"
,
dropdown_title:
"Select milestone"
=
render
"shared/issuable/milestone_dropdown"
,
selected:
issuable
.
milestone
,
name:
"
#{
issuable
.
class
.
model_name
.
param_key
}
[milestone_id]"
,
show_any:
false
,
show_upcoming:
false
,
show_started:
false
,
extra_class:
"qa-issuable-milestone-dropdown js-issuable-form-dropdown js-dropdown-keep-input"
,
dropdown_title:
"Select milestone"
.form-group.row
.form-group.row
-
has_labels
=
@labels
&&
@labels
.
any?
=
form
.
label
:label_ids
,
"Labels"
,
class:
"col-form-label
#{
has_due_date
?
"col-md-2 col-lg-4"
:
"col-sm-2"
}
"
=
form
.
label
:label_ids
,
"Labels"
,
class:
"col-form-label
#{
has_due_date
?
"col-md-2 col-lg-4"
:
"col-sm-2"
}
"
=
form
.
hidden_field
:label_ids
,
multiple:
true
,
value:
''
=
form
.
hidden_field
:label_ids
,
multiple:
true
,
value:
''
.col-sm-10
{
class:
"#{"
col
-
md
-
8
" if has_due_date}
#{'issuable-form-padding-top' if !has_labels}
"
}
.col-sm-10
{
class:
"#{"
col
-
md
-
8
" if has_due_date}"
}
.issuable-form-select-holder
.issuable-form-select-holder
=
render
"shared/issuable/label_dropdown"
,
classes:
[
"js-issuable-form-dropdown"
],
selected:
issuable
.
labels
,
data_options:
{
field_name:
"
#{
issuable
.
class
.
model_name
.
param_key
}
[label_ids][]"
,
show_any:
false
},
dropdown_title:
"Select label"
=
render
"shared/issuable/label_dropdown"
,
classes:
[
"js-issuable-form-dropdown"
],
selected:
issuable
.
labels
,
data_options:
{
field_name:
"
#{
issuable
.
class
.
model_name
.
param_key
}
[label_ids][]"
,
show_any:
false
},
dropdown_title:
"Select label"
...
...
spec/controllers/projects/merge_requests_controller_spec.rb
View file @
9f976548
...
@@ -30,19 +30,6 @@ describe Projects::MergeRequestsController do
...
@@ -30,19 +30,6 @@ describe Projects::MergeRequestsController do
end
end
end
end
shared_examples
"loads labels"
do
|
action
|
it
"loads labels into the @labels variable"
do
get
action
,
params:
{
namespace_id:
project
.
namespace
.
to_param
,
project_id:
project
,
id:
merge_request
.
iid
},
format:
'html'
expect
(
assigns
(
:labels
)).
not_to
be_nil
end
end
describe
"GET show"
do
describe
"GET show"
do
def
go
(
extra_params
=
{})
def
go
(
extra_params
=
{})
params
=
{
params
=
{
...
@@ -54,8 +41,6 @@ describe Projects::MergeRequestsController do
...
@@ -54,8 +41,6 @@ describe Projects::MergeRequestsController do
get
:show
,
params:
params
.
merge
(
extra_params
)
get
:show
,
params:
params
.
merge
(
extra_params
)
end
end
it_behaves_like
"loads labels"
,
:show
describe
'as html'
do
describe
'as html'
do
context
'when diff files were cleaned'
do
context
'when diff files were cleaned'
do
render_views
render_views
...
...
spec/helpers/issuables_helper_spec.rb
View file @
9f976548
...
@@ -43,16 +43,19 @@ describe IssuablesHelper do
...
@@ -43,16 +43,19 @@ describe IssuablesHelper do
end
end
describe
'#issuable_labels_tooltip'
do
describe
'#issuable_labels_tooltip'
do
let
(
:label_entity
)
{
LabelEntity
.
represent
(
label
)
}
let
(
:label2_entity
)
{
LabelEntity
.
represent
(
label2
)
}
it
'returns label text with no labels'
do
it
'returns label text with no labels'
do
expect
(
issuable_labels_tooltip
([])).
to
eq
(
"Labels"
)
expect
(
issuable_labels_tooltip
([])).
to
eq
(
"Labels"
)
end
end
it
'returns label text with labels within max limit'
do
it
'returns label text with labels within max limit'
do
expect
(
issuable_labels_tooltip
([
label
])).
to
eq
(
label
.
title
)
expect
(
issuable_labels_tooltip
([
label
_entity
])).
to
eq
(
label
[
:title
]
)
end
end
it
'returns label text with labels exceeding max limit'
do
it
'returns label text with labels exceeding max limit'
do
expect
(
issuable_labels_tooltip
([
label
,
label2
],
limit:
1
)).
to
eq
(
"
#{
label
.
title
}
, and 1 more"
)
expect
(
issuable_labels_tooltip
([
label
_entity
,
label2_entity
],
limit:
1
)).
to
eq
(
"
#{
label
[
:title
]
}
, and 1 more"
)
end
end
end
end
...
@@ -197,33 +200,4 @@ describe IssuablesHelper do
...
@@ -197,33 +200,4 @@ describe IssuablesHelper do
expect
(
helper
.
issuable_initial_data
(
issue
)).
to
eq
(
expected_data
)
expect
(
helper
.
issuable_initial_data
(
issue
)).
to
eq
(
expected_data
)
end
end
end
end
describe
'#selected_labels'
do
context
'if label_name param is a string'
do
it
'returns a new label with title'
do
allow
(
helper
).
to
receive
(
:params
)
.
and_return
(
ActionController
::
Parameters
.
new
(
label_name:
'test label'
))
labels
=
helper
.
selected_labels
expect
(
labels
).
to
be_an
(
Array
)
expect
(
labels
.
size
).
to
eq
(
1
)
expect
(
labels
.
first
.
title
).
to
eq
(
'test label'
)
end
end
context
'if label_name param is an array'
do
it
'returns a new label with title for each element'
do
allow
(
helper
).
to
receive
(
:params
)
.
and_return
(
ActionController
::
Parameters
.
new
(
label_name:
[
'test label 1'
,
'test label 2'
]))
labels
=
helper
.
selected_labels
expect
(
labels
).
to
be_an
(
Array
)
expect
(
labels
.
size
).
to
eq
(
2
)
expect
(
labels
.
first
.
title
).
to
eq
(
'test label 1'
)
expect
(
labels
.
second
.
title
).
to
eq
(
'test label 2'
)
end
end
end
end
end
spec/serializers/entity_date_helper_spec.rb
View file @
9f976548
...
@@ -96,5 +96,31 @@ describe EntityDateHelper do
...
@@ -96,5 +96,31 @@ describe EntityDateHelper do
expect
(
milestone_remaining
).
to
eq
(
"<strong>2</strong> days elapsed"
)
expect
(
milestone_remaining
).
to
eq
(
"<strong>2</strong> days elapsed"
)
end
end
end
end
context
'with Hash as param'
do
context
'when due_date is in the past'
do
it
'returns "Past due"'
do
expect
(
date_helper_class
.
remaining_days_in_words
(
due_date:
2
.
days
.
ago
.
to_date
)).
to
eq
(
"<strong>Past due</strong>"
)
end
end
context
'when due_date is in the future'
do
it
'returns days remaining'
do
expect
(
date_helper_class
.
remaining_days_in_words
(
due_date:
12
.
days
.
from_now
.
to_date
)).
to
eq
(
"<strong>12</strong> days remaining"
)
end
end
context
'when start_date is in the future'
do
it
'returns "Upcoming"'
do
expect
(
date_helper_class
.
remaining_days_in_words
(
start_date:
2
.
days
.
from_now
.
to_date
)).
to
eq
(
"<strong>Upcoming</strong>"
)
end
end
context
'when start_date is in the past'
do
it
'returns days elapsed'
do
expect
(
date_helper_class
.
remaining_days_in_words
(
start_date:
2
.
days
.
ago
.
to_date
)).
to
eq
(
"<strong>2</strong> days elapsed"
)
end
end
end
end
end
end
end
spec/serializers/merge_request_serializer_spec.rb
View file @
9f976548
...
@@ -20,7 +20,7 @@ describe MergeRequestSerializer do
...
@@ -20,7 +20,7 @@ describe MergeRequestSerializer do
context
'sidebar merge request serialization'
do
context
'sidebar merge request serialization'
do
let
(
:serializer
)
{
'sidebar_extras'
}
let
(
:serializer
)
{
'sidebar_extras'
}
it
'matches
basic
merge request json schema'
do
it
'matches
sidebar
merge request json schema'
do
expect
(
json_entity
).
to
match_schema
(
'entities/merge_request_sidebar'
)
expect
(
json_entity
).
to
match_schema
(
'entities/merge_request_sidebar'
)
end
end
end
end
...
...
spec/views/projects/merge_requests/show.html.haml_spec.rb
View file @
9f976548
...
@@ -32,6 +32,11 @@ describe 'projects/merge_requests/show.html.haml' do
...
@@ -32,6 +32,11 @@ describe 'projects/merge_requests/show.html.haml' do
assign
(
:noteable
,
closed_merge_request
)
assign
(
:noteable
,
closed_merge_request
)
assign
(
:notes
,
[])
assign
(
:notes
,
[])
assign
(
:pipelines
,
Ci
::
Pipeline
.
none
)
assign
(
:pipelines
,
Ci
::
Pipeline
.
none
)
assign
(
:issuable_sidebar
,
MergeRequestSerializer
.
new
(
current_user:
user
,
project:
project
)
.
represent
(
closed_merge_request
,
serializer:
'sidebar'
)
)
preload_view_requirements
preload_view_requirements
...
...
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