Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
e6cdfb60
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,发现更多精彩内容 >>
提交
e6cdfb60
编写于
10月 25, 2012
作者:
V
Valeriy Sizov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
API: tests for merge_requests
上级
77bc1101
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
72 addition
and
10 deletion
+72
-10
doc/api/merge_requests.md
doc/api/merge_requests.md
+5
-5
lib/api/merge_requests.rb
lib/api/merge_requests.rb
+5
-5
spec/requests/api/merge_requests_spec.rb
spec/requests/api/merge_requests_spec.rb
+62
-0
未找到文件。
doc/api/merge_requests.md
浏览文件 @
e6cdfb60
...
...
@@ -3,7 +3,7 @@
Get all MR for this project.
```
GET /:id/merge_requests
GET /
projects/
:id/merge_requests
```
Parameters:
...
...
@@ -43,7 +43,7 @@ Parameters:
Show information about MR.
```
GET /:id/merge_request/:merge_request_id
GET /
projects/
:id/merge_request/:merge_request_id
```
Parameters:
...
...
@@ -83,7 +83,7 @@ Parameters:
Create MR.
```
POST /:id/merge_requests
POST /
projects/
:id/merge_requests
```
Parameters:
...
...
@@ -125,7 +125,7 @@ Parameters:
Update MR. You can change branches, title, or even close the MR.
```
PUT /:id/merge_request/:merge_request_id
PUT /
projects/
:id/merge_request/:merge_request_id
```
Parameters:
...
...
@@ -169,7 +169,7 @@ Parameters:
Post comment to MR
```
POST /:id/merge_request/:merge_request_id/comments
POST /
projects/
:id/merge_request/:merge_request_id/comments
```
Parameters:
...
...
lib/api/merge_requests.rb
浏览文件 @
e6cdfb60
...
...
@@ -11,7 +11,7 @@ module Gitlab
# id (required) - The ID or code name of a project
#
# Example:
# GET /:id/merge_requests
# GET /
projects/
:id/merge_requests
#
get
":id/merge_requests"
do
authorize!
:read_merge_request
,
user_project
...
...
@@ -26,7 +26,7 @@ module Gitlab
# merge_request_id (required) - The ID of MR
#
# Example:
# GET /:id/merge_request/:merge_request_id
# GET /
projects/
:id/merge_request/:merge_request_id
#
get
":id/merge_request/:merge_request_id"
do
merge_request
=
user_project
.
merge_requests
.
find
(
params
[
:merge_request_id
])
...
...
@@ -47,7 +47,7 @@ module Gitlab
# title (required) - Title of MR
#
# Example:
# POST /:id/merge_requests
# POST /
projects/
:id/merge_requests
#
post
":id/merge_requests"
do
attrs
=
attributes_for_keys
[
:source_branch
,
:target_branch
,
:assignee_id
,
:title
]
...
...
@@ -75,7 +75,7 @@ module Gitlab
# title - Title of MR
# closed - Status of MR. true - closed
# Example:
# PUT /:id/merge_request/:merge_request_id
# PUT /
projects/
:id/merge_request/:merge_request_id
#
put
":id/merge_request/:merge_request_id"
do
attrs
=
attributes_for_keys
[
:source_branch
,
:target_branch
,
:assignee_id
,
:title
,
:closed
]
...
...
@@ -99,7 +99,7 @@ module Gitlab
# merge_request_id (required) - ID of MR
# note (required) - Text of comment
# Examples:
# POST /:id/merge_request/:merge_request_id/comments
# POST /
projects/
:id/merge_request/:merge_request_id/comments
#
post
":id/merge_request/:merge_request_id/comments"
do
merge_request
=
user_project
.
merge_requests
.
find
(
params
[
:merge_request_id
])
...
...
spec/requests/api/merge_requests_spec.rb
0 → 100644
浏览文件 @
e6cdfb60
require
"spec_helper"
describe
Gitlab
::
API
do
include
ApiHelpers
let
(
:user
)
{
Factory
:user
}
let!
(
:project
)
{
Factory
:project
,
owner:
user
}
let!
(
:merge_request
)
{
Factory
:merge_request
,
author:
user
,
assignee:
user
,
project:
project
,
title:
"Test"
}
before
{
project
.
add_access
(
user
,
:read
)
}
describe
"GET /projects/:id/merge_requests"
do
context
"when unauthenticated"
do
it
"should return authentication error"
do
get
api
(
"/projects/
#{
project
.
id
}
/merge_requests"
)
response
.
status
.
should
==
401
end
end
context
"when authenticated"
do
it
"should return an array of merge_requests"
do
get
api
(
"/projects/
#{
project
.
id
}
/merge_requests"
,
user
)
response
.
status
.
should
==
200
json_response
.
should
be_an
Array
json_response
.
first
[
'title'
].
should
==
merge_request
.
title
end
end
end
describe
"GET /projects/:id/merge_request/:merge_request_id"
do
it
"should return merge_request"
do
get
api
(
"/projects/
#{
project
.
id
}
/merge_request/
#{
merge_request
.
id
}
"
,
user
)
response
.
status
.
should
==
200
json_response
[
'title'
].
should
==
merge_request
.
title
end
end
describe
"POST /projects/:id/merge_requests"
do
it
"should return merge_request"
do
post
api
(
"/projects/
#{
project
.
id
}
/merge_requests"
,
user
),
title:
'Test merge_request'
,
source_branch:
"stable"
,
target_branch:
"master"
,
author:
user
response
.
status
.
should
==
201
json_response
[
'title'
].
should
==
'Test merge_request'
end
end
describe
"PUT /projects/:id/merge_request/:merge_request_id"
do
it
"should return merge_request"
do
put
api
(
"/projects/
#{
project
.
id
}
/merge_request/
#{
merge_request
.
id
}
"
,
user
),
title:
"New title"
response
.
status
.
should
==
200
json_response
[
'title'
].
should
==
'New title'
end
end
describe
"POST /projects/:id/merge_request/:merge_request_id/comments"
do
it
"should return comment"
do
post
api
(
"/projects/
#{
project
.
id
}
/merge_request/
#{
merge_request
.
id
}
/comments"
,
user
),
note:
"My comment"
response
.
status
.
should
==
201
json_response
[
'note'
].
should
==
'My comment'
end
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录