Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
6ff16f4b
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
6ff16f4b
编写于
7月 16, 2019
作者:
B
blunceford
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix bug with closed milestones in dashboard
上级
b8d876f1
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
23 addition
and
2 deletion
+23
-2
app/models/dashboard_group_milestone.rb
app/models/dashboard_group_milestone.rb
+1
-2
spec/controllers/dashboard/milestones_controller_spec.rb
spec/controllers/dashboard/milestones_controller_spec.rb
+22
-0
未找到文件。
app/models/dashboard_group_milestone.rb
浏览文件 @
6ff16f4b
...
...
@@ -15,8 +15,7 @@ class DashboardGroupMilestone < GlobalMilestone
milestones
=
Milestone
.
of_groups
(
groups
.
select
(
:id
))
.
reorder_by_due_date_asc
.
order_by_name_asc
.
active
milestones
=
milestones
.
search_title
(
params
[
:search_title
])
if
params
[
:search_title
].
present?
milestones
.
map
{
|
m
|
new
(
m
)
}
Milestone
.
filter_by_state
(
milestones
,
params
[
:state
])
.
map
{
|
m
|
new
(
m
)
}
end
end
spec/controllers/dashboard/milestones_controller_spec.rb
浏览文件 @
6ff16f4b
...
...
@@ -59,6 +59,18 @@ describe Dashboard::MilestonesController do
expect
(
json_response
.
map
{
|
i
|
i
[
"group_name"
]
}.
compact
).
to
match_array
(
group
.
name
)
end
it
'returns closed group and project milestones to which the user belongs'
do
closed_group_milestone
=
create
(
:milestone
,
group:
group
,
state:
'closed'
)
closed_project_milestone
=
create
(
:milestone
,
project:
project
,
state:
'closed'
)
get
:index
,
params:
{
state:
'closed'
},
format: :json
expect
(
response
).
to
have_gitlab_http_status
(
200
)
expect
(
json_response
.
size
).
to
eq
(
2
)
expect
(
json_response
.
map
{
|
i
|
i
[
"name"
]
}).
to
match_array
([
closed_group_milestone
.
name
,
closed_project_milestone
.
name
])
expect
(
json_response
.
map
{
|
i
|
i
[
"group_name"
]
}.
compact
).
to
match_array
(
group
.
name
)
end
it
'searches legacy project milestones by title when search_title is given'
do
project_milestone
=
create
(
:milestone
,
title:
'Project milestone title'
,
project:
project
)
...
...
@@ -84,6 +96,16 @@ describe Dashboard::MilestonesController do
expect
(
response
.
body
).
to
include
(
"Closed
\n
<span class=
\"
badge badge-pill
\"
>0</span>"
)
end
it
'shows counts of closed group and project milestones to which the user belongs to'
do
closed_group_milestone
=
create
(
:milestone
,
group:
group
,
state:
'closed'
)
closed_project_milestone
=
create
(
:milestone
,
project:
project
,
state:
'closed'
)
get
:index
expect
(
response
.
body
).
to
include
(
"Open
\n
<span class=
\"
badge badge-pill
\"
>2</span>"
)
expect
(
response
.
body
).
to
include
(
"Closed
\n
<span class=
\"
badge badge-pill
\"
>2</span>"
)
end
context
'external authorization'
do
subject
{
get
:index
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录