Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
c7e00aca
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,体验更适合开发者的 AI 搜索 >>
未验证
提交
c7e00aca
编写于
5月 27, 2014
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Better specs for Compare API
Signed-off-by:
N
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
上级
10ee137e
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
28 addition
and
10 deletion
+28
-10
lib/api/entities.rb
lib/api/entities.rb
+3
-1
spec/requests/api/repositories_spec.rb
spec/requests/api/repositories_spec.rb
+25
-9
未找到文件。
lib/api/entities.rb
浏览文件 @
c7e00aca
...
...
@@ -202,7 +202,9 @@ module API
class
Compare
<
Grape
::
Entity
expose
:commit
,
using:
Entities
::
RepoCommit
do
|
compare
,
options
|
Commit
.
new
compare
.
commit
if
compare
.
commit
Commit
.
new
compare
.
commit
end
end
expose
:commits
,
using:
Entities
::
RepoCommit
do
|
compare
,
options
|
Commit
.
decorate
compare
.
commits
...
...
spec/requests/api/repositories_spec.rb
浏览文件 @
c7e00aca
...
...
@@ -114,25 +114,41 @@ describe API::API, api: true do
end
describe
'GET /GET /projects/:id/repository/compare'
do
it
"should compare
2
branches"
do
it
"should compare branches"
do
get
api
(
"/projects/
#{
project
.
id
}
/repository/compare"
,
user
),
from:
'master'
,
to:
'simple_merge_request'
response
.
status
.
should
==
200
json_response
[
'commits'
].
s
ize
.
should
==
3
json_response
[
'diffs'
].
s
ize
.
should
==
1
json_response
[
'commits'
].
s
hould
be_present
json_response
[
'diffs'
].
s
hould
be_present
end
it
"should compare 2 commits"
do
it
"should compare tags"
do
get
api
(
"/projects/
#{
project
.
id
}
/repository/compare"
,
user
),
from:
'v1.0.1'
,
to:
'v1.0.2'
response
.
status
.
should
==
200
json_response
[
'commits'
].
should
be_present
json_response
[
'diffs'
].
should
be_present
end
it
"should compare commits"
do
get
api
(
"/projects/
#{
project
.
id
}
/repository/compare"
,
user
),
from:
'b1e6a9dbf1c85'
,
to:
'1e689bfba395'
response
.
status
.
should
==
200
json_response
[
'commits'
].
size
.
should
==
0
json_response
[
'diffs'
].
size
.
should
==
0
json_response
[
'commits'
].
should
be_empty
json_response
[
'diffs'
].
should
be_empty
json_response
[
'compare_same_ref'
].
should
be_false
end
it
"should compare
2 commits
"
do
it
"should compare
commits in reverse order
"
do
get
api
(
"/projects/
#{
project
.
id
}
/repository/compare"
,
user
),
from:
'1e689bfba395'
,
to:
'b1e6a9dbf1c85'
response
.
status
.
should
==
200
json_response
[
'commits'
].
size
.
should
==
4
json_response
[
'diffs'
].
size
.
should
==
9
json_response
[
'commits'
].
should
be_present
json_response
[
'diffs'
].
should
be_present
end
it
"should compare same refs"
do
get
api
(
"/projects/
#{
project
.
id
}
/repository/compare"
,
user
),
from:
'master'
,
to:
'master'
response
.
status
.
should
==
200
json_response
[
'commits'
].
should
be_empty
json_response
[
'diffs'
].
should
be_empty
json_response
[
'compare_same_ref'
].
should
be_true
end
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录