Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
d9e01915
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 搜索 >>
提交
d9e01915
编写于
3月 01, 2016
作者:
R
Rubén Dávila
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add some specs for Repository#revert.
上级
0c116d8e
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
32 addition
and
5 deletion
+32
-5
app/models/repository.rb
app/models/repository.rb
+1
-1
spec/models/repository_spec.rb
spec/models/repository_spec.rb
+31
-4
未找到文件。
app/models/repository.rb
浏览文件 @
d9e01915
...
...
@@ -656,7 +656,7 @@ class Repository
def
revert
(
user
,
commit
,
base_branch
,
revert_tree_id
=
nil
)
source_sha
=
find_branch
(
base_branch
).
target
revert_tree_id
=
check_revert_content
(
commit
,
base_branch
)
unless
revert_tree_id
revert_tree_id
||=
check_revert_content
(
commit
,
base_branch
)
return
false
unless
revert_tree_id
...
...
spec/models/repository_spec.rb
浏览文件 @
d9e01915
...
...
@@ -457,11 +457,38 @@ describe Repository, models: true do
end
end
describe
'#revert
_merge
'
do
it
'should revert the changes'
do
repository
.
revert
(
user
,
merge_commit
,
'master'
)
describe
'#revert'
do
let
(
:new_image_commit
)
{
repository
.
commit
(
'33f3729a45c02fc67d00adb1b8bca394b0e761d9'
)
}
let
(
:update_image_commit
)
{
repository
.
commit
(
'2f63565e7aac07bcdadb654e253078b727143ec4'
)
}
expect
(
repository
.
blob_at_branch
(
'master'
,
'files/ruby/feature.rb'
)).
not_to
be_present
context
'when there is a conflict'
do
it
'should abort the operation'
do
expect
(
repository
.
revert
(
user
,
new_image_commit
,
'master'
)).
to
eq
(
false
)
end
end
context
'when commit was already reverted'
do
it
'should abort the operation'
do
repository
.
revert
(
user
,
update_image_commit
,
'master'
)
expect
(
repository
.
revert
(
user
,
update_image_commit
,
'master'
)).
to
eq
(
false
)
end
end
context
'when commit can be reverted'
do
it
'should revert the changes'
do
expect
(
repository
.
revert
(
user
,
update_image_commit
,
'master'
)).
to
be_truthy
end
end
context
'reverting a merge commit'
do
it
'should revert the changes'
do
merge_commit
expect
(
repository
.
blob_at_branch
(
'master'
,
'files/ruby/feature.rb'
)).
to
be_present
repository
.
revert
(
user
,
merge_commit
,
'master'
)
expect
(
repository
.
blob_at_branch
(
'master'
,
'files/ruby/feature.rb'
)).
not_to
be_present
end
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录