Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
94ca25c9
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,发现更多精彩内容 >>
提交
94ca25c9
编写于
7月 25, 2016
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Improve merge request diff creation and update tests
Signed-off-by:
N
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
上级
ceff8106
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
17 addition
and
17 deletion
+17
-17
app/models/merge_request.rb
app/models/merge_request.rb
+1
-5
spec/models/merge_request_spec.rb
spec/models/merge_request_spec.rb
+16
-12
未找到文件。
app/models/merge_request.rb
浏览文件 @
94ca25c9
...
...
@@ -299,12 +299,8 @@ class MergeRequest < ActiveRecord::Base
def
reload_diff
return
unless
open
?
merge_request_diff
=
merge_request_diffs
.
create
old_diff_refs
=
self
.
diff_refs
merge_request_diff
.
reload_content
create_merge_request_diff
new_diff_refs
=
self
.
diff_refs
update_diff_notes_positions
(
...
...
spec/models/merge_request_spec.rb
浏览文件 @
94ca25c9
...
...
@@ -9,7 +9,7 @@ describe MergeRequest, models: true do
it
{
is_expected
.
to
belong_to
(
:target_project
).
with_foreign_key
(
:target_project_id
).
class_name
(
'Project'
)
}
it
{
is_expected
.
to
belong_to
(
:source_project
).
with_foreign_key
(
:source_project_id
).
class_name
(
'Project'
)
}
it
{
is_expected
.
to
belong_to
(
:merge_user
).
class_name
(
"User"
)
}
it
{
is_expected
.
to
have_
one
(
:merge_request_diff
).
dependent
(
:destroy
)
}
it
{
is_expected
.
to
have_
many
(
:merge_request_diffs
).
dependent
(
:destroy
)
}
end
describe
'modules'
do
...
...
@@ -134,7 +134,7 @@ describe MergeRequest, models: true do
context
'when there are MR diffs'
do
it
'delegates to the MR diffs'
do
merge_request
.
merge_request_diff
=
MergeRequestDiff
.
new
merge_request
.
merge_request_diff
s
.
build
expect
(
merge_request
.
merge_request_diff
).
to
receive
(
:diffs
).
with
(
options
)
...
...
@@ -654,22 +654,26 @@ describe MergeRequest, models: true do
let
(
:commit
)
{
subject
.
project
.
commit
(
sample_commit
.
id
)
}
it
"reloads the diff content"
do
expect
(
subject
.
merge_request_diff
).
to
receive
(
:reload_content
)
it
"does not change existing merge request diff"
do
expect
(
subject
.
merge_request_diff
).
not_to
receive
(
:reload_content
)
subject
.
reload_diff
end
it
"creates new merge request diff"
do
expect
{
subject
.
reload_diff
}.
to
change
{
subject
.
merge_request_diffs
.
count
}.
by
(
1
)
end
it
"updates diff note positions"
do
old_diff_refs
=
subject
.
diff_refs
merge_request_diff
=
subject
.
merge_request_diff
# Update merge_request_diff so that #diff_refs will return commit.diff_refs
allow
(
merge_request_diff
).
to
receive
(
:reload_content
)
do
merge_request_diff
.
base_commit_sha
=
commit
.
parent_id
merge_request_diff
.
start_commit_sha
=
commit
.
parent_id
merge_request_diff
.
head_commit_sha
=
commit
.
sha
allow
(
subject
).
to
receive
(
:create_merge_request_diff
)
do
subject
.
merge_request_diffs
.
create
(
importing:
true
,
base_commit_sha:
commit
.
parent_id
,
start_commit_sha:
commit
.
parent_id
,
head_commit_sha:
commit
.
sha
)
end
expect
(
Notes
::
DiffPositionUpdateService
).
to
receive
(
:new
).
with
(
...
...
@@ -679,8 +683,8 @@ describe MergeRequest, models: true do
new_diff_refs:
commit
.
diff_refs
,
paths:
note
.
position
.
paths
).
and_call_original
expect_any_instance_of
(
Notes
::
DiffPositionUpdateService
).
to
receive
(
:execute
).
with
(
note
)
expect_any_instance_of
(
Notes
::
DiffPositionUpdateService
).
to
receive
(
:execute
).
with
(
note
)
expect_any_instance_of
(
DiffNote
).
to
receive
(
:save
).
once
subject
.
reload_diff
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录