Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
b91d1890
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,发现更多精彩内容 >>
提交
b91d1890
编写于
2月 10, 2016
作者:
R
Rémy Coutable
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Pass current_user to merge_request.closes_issues in API ans streamline MR API specs
上级
78e36780
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
9 addition
and
19 deletion
+9
-19
lib/api/merge_requests.rb
lib/api/merge_requests.rb
+1
-1
spec/factories/merge_requests.rb
spec/factories/merge_requests.rb
+0
-6
spec/requests/api/merge_requests_spec.rb
spec/requests/api/merge_requests_spec.rb
+8
-12
未找到文件。
lib/api/merge_requests.rb
浏览文件 @
b91d1890
...
...
@@ -310,7 +310,7 @@ module API
# GET /projects/:id/merge_requests/:merge_request_id/closes_issues
get
"
#{
path
}
/closes_issues"
do
merge_request
=
user_project
.
merge_requests
.
find
(
params
[
:merge_request_id
])
issues
=
::
Kaminari
.
paginate_array
(
merge_request
.
closes_issues
)
issues
=
::
Kaminari
.
paginate_array
(
merge_request
.
closes_issues
(
current_user
)
)
present
paginate
(
issues
),
with:
Entities
::
Issue
end
end
...
...
spec/factories/merge_requests.rb
浏览文件 @
b91d1890
...
...
@@ -73,12 +73,6 @@ FactoryGirl.define do
merge_user
author
end
trait
:with_closes_issues
do
source_branch
"markdown"
target_branch
"master"
state
:opened
end
factory
:closed_merge_request
,
traits:
[
:closed
]
factory
:reopened_merge_request
,
traits:
[
:reopened
]
factory
:merge_request_with_diffs
,
traits:
[
:with_diffs
]
...
...
spec/requests/api/merge_requests_spec.rb
浏览文件 @
b91d1890
...
...
@@ -448,25 +448,21 @@ describe API::API, api: true do
end
end
describe
"GET :id/merge_requests/:merge_request_id/closes_issues"
do
let
(
:merge_request_with_closes_issues
)
{
create
(
:merge_request
,
:with_closes_issues
,
author:
user
,
assignee:
user
,
source_project:
project
,
target_project:
project
,
title:
"Closed #
#{
issue
.
id
}
"
,
created_at:
base_time
+
3
.
seconds
,
description:
"This should close #
#{
issue
.
iid
}
"
)
}
let
(
:issue
)
do
create
:issue
,
author:
user
,
assignee:
user
,
project:
project
,
milestone:
nil
end
describe
'GET :id/merge_requests/:merge_request_id/closes_issues'
do
it
'returns the issue that will be closed on merge'
do
issue
=
create
(
:issue
,
project:
project
)
mr
=
merge_request
.
tap
do
|
mr
|
mr
.
update_attribute
(
:description
,
"Closes
#{
issue
.
to_reference
(
mr
.
project
)
}
"
)
end
it
"should return the issues that will be closed on merge"
do
get
api
(
"/projects/
#{
project
.
id
}
/merge_requests/
#{
merge_request_with_closes_issues
.
id
}
/closes_issues"
,
user
)
get
api
(
"/projects/
#{
project
.
id
}
/merge_requests/
#{
mr
.
id
}
/closes_issues"
,
user
)
expect
(
response
.
status
).
to
eq
(
200
)
expect
(
json_response
).
to
be_an
Array
expect
(
json_response
.
length
).
to
eq
(
1
)
expect
(
json_response
.
first
[
'id'
]).
to
eq
(
issue
.
id
)
end
it
"should return an empty array when there are no issues to be closed"
do
it
'returns an empty array when there are no issues to be closed'
do
get
api
(
"/projects/
#{
project
.
id
}
/merge_requests/
#{
merge_request
.
id
}
/closes_issues"
,
user
)
expect
(
response
.
status
).
to
eq
(
200
)
expect
(
json_response
).
to
be_an
Array
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录