Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
5a883915
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 搜索 >>
未验证
提交
5a883915
编写于
9月 18, 2018
作者:
N
Nick Thomas
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Guard against regressions in commit email specs
上级
12f98792
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
12 addition
and
5 deletion
+12
-5
app/models/project_wiki.rb
app/models/project_wiki.rb
+4
-3
spec/models/project_wiki_spec.rb
spec/models/project_wiki_spec.rb
+3
-0
spec/services/files/create_service_spec.rb
spec/services/files/create_service_spec.rb
+1
-0
spec/services/files/delete_service_spec.rb
spec/services/files/delete_service_spec.rb
+2
-1
spec/services/files/update_service_spec.rb
spec/services/files/update_service_spec.rb
+2
-1
未找到文件。
app/models/project_wiki.rb
浏览文件 @
5a883915
...
...
@@ -184,11 +184,12 @@ class ProjectWiki
def
commit_details
(
action
,
message
=
nil
,
title
=
nil
)
commit_message
=
message
||
default_message
(
action
,
title
)
git_user
=
Gitlab
::
Git
::
User
.
from_gitlab
(
@user
)
Gitlab
::
Git
::
Wiki
::
CommitDetails
.
new
(
@user
.
id
,
@
user
.
username
,
@
user
.
name
,
@user
.
commit_
email
,
git_
user
.
username
,
git_
user
.
name
,
git_user
.
email
,
commit_message
)
end
...
...
spec/models/project_wiki_spec.rb
浏览文件 @
5a883915
...
...
@@ -280,6 +280,7 @@ describe ProjectWiki do
it
'sets the correct commit email'
do
subject
.
create_page
(
'test page'
,
'content'
)
expect
(
user
.
commit_email
).
not_to
eq
(
user
.
email
)
expect
(
commit
.
author_email
).
to
eq
(
user
.
commit_email
)
expect
(
commit
.
committer_email
).
to
eq
(
user
.
commit_email
)
end
...
...
@@ -329,6 +330,7 @@ describe ProjectWiki do
end
it
'sets the correct commit email'
do
expect
(
user
.
commit_email
).
not_to
eq
(
user
.
email
)
expect
(
commit
.
author_email
).
to
eq
(
user
.
commit_email
)
expect
(
commit
.
committer_email
).
to
eq
(
user
.
commit_email
)
end
...
...
@@ -363,6 +365,7 @@ describe ProjectWiki do
it
'sets the correct commit email'
do
subject
.
delete_page
(
@page
)
expect
(
user
.
commit_email
).
not_to
eq
(
user
.
email
)
expect
(
commit
.
author_email
).
to
eq
(
user
.
commit_email
)
expect
(
commit
.
committer_email
).
to
eq
(
user
.
commit_email
)
end
...
...
spec/services/files/create_service_spec.rb
浏览文件 @
5a883915
...
...
@@ -84,6 +84,7 @@ describe Files::CreateService do
it
'uses the commit email'
do
subject
.
execute
expect
(
user
.
commit_email
).
not_to
eq
(
user
.
email
)
expect
(
commit
.
author_email
).
to
eq
(
user
.
commit_email
)
expect
(
commit
.
committer_email
).
to
eq
(
user
.
commit_email
)
end
...
...
spec/services/files/delete_service_spec.rb
浏览文件 @
5a883915
...
...
@@ -4,7 +4,7 @@ describe Files::DeleteService do
subject
{
described_class
.
new
(
project
,
user
,
commit_params
)
}
let
(
:project
)
{
create
(
:project
,
:repository
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:user
)
{
create
(
:user
,
:commit_email
)
}
let
(
:file_path
)
{
'files/ruby/popen.rb'
}
let
(
:branch_name
)
{
project
.
default_branch
}
let
(
:last_commit_sha
)
{
nil
}
...
...
@@ -39,6 +39,7 @@ describe Files::DeleteService do
it
'uses the commit email'
do
subject
.
execute
expect
(
user
.
commit_email
).
not_to
eq
(
user
.
email
)
expect
(
commit
.
author_email
).
to
eq
(
user
.
commit_email
)
expect
(
commit
.
committer_email
).
to
eq
(
user
.
commit_email
)
end
...
...
spec/services/files/update_service_spec.rb
浏览文件 @
5a883915
...
...
@@ -4,7 +4,7 @@ describe Files::UpdateService do
subject
{
described_class
.
new
(
project
,
user
,
commit_params
)
}
let
(
:project
)
{
create
(
:project
,
:repository
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:user
)
{
create
(
:user
,
:commit_email
)
}
let
(
:file_path
)
{
'files/ruby/popen.rb'
}
let
(
:new_contents
)
{
'New Content'
}
let
(
:branch_name
)
{
project
.
default_branch
}
...
...
@@ -59,6 +59,7 @@ describe Files::UpdateService do
it
'uses the commit email'
do
subject
.
execute
expect
(
user
.
commit_email
).
not_to
eq
(
user
.
email
)
expect
(
commit
.
author_email
).
to
eq
(
user
.
commit_email
)
expect
(
commit
.
committer_email
).
to
eq
(
user
.
commit_email
)
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录