Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
042cf15b
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,发现更多精彩内容 >>
提交
042cf15b
编写于
7月 18, 2017
作者:
L
Lin Jen-Shin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Cache Note#notable for commits and fix tests
上级
4d03873c
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
11 addition
and
5 deletion
+11
-5
app/models/note.rb
app/models/note.rb
+1
-1
spec/factories/commits.rb
spec/factories/commits.rb
+7
-2
spec/features/participants_autocomplete_spec.rb
spec/features/participants_autocomplete_spec.rb
+2
-1
spec/services/notification_service_spec.rb
spec/services/notification_service_spec.rb
+1
-1
未找到文件。
app/models/note.rb
浏览文件 @
042cf15b
...
...
@@ -190,7 +190,7 @@ class Note < ActiveRecord::Base
# override to return commits, which are not active record
def
noteable
if
for_commit?
project
.
commit
(
commit_id
)
@commit
||=
project
.
commit
(
commit_id
)
else
super
end
...
...
spec/factories/commits.rb
浏览文件 @
042cf15b
...
...
@@ -4,14 +4,19 @@ FactoryGirl.define do
factory
:commit
do
git_commit
RepoHelpers
.
sample_commit
project
factory: :empty_project
author
{
build
(
:author
)
}
initialize_with
do
new
(
git_commit
,
project
)
end
after
(
:build
)
do
|
commit
|
allow
(
commit
).
to
receive
(
:author
).
and_return
build
(
:author
)
end
trait
:without_author
do
author
nil
after
(
:build
)
do
|
commit
|
allow
(
commit
).
to
receive
(
:author
).
and_return
nil
end
end
end
end
spec/features/participants_autocomplete_spec.rb
浏览文件 @
042cf15b
...
...
@@ -54,7 +54,8 @@ feature 'Member autocomplete', :js do
let
(
:note
)
{
create
(
:note_on_commit
,
project:
project
,
commit_id:
project
.
commit
.
id
)
}
before
do
allow_any_instance_of
(
Commit
).
to
receive
(
:author
).
and_return
(
author
)
allow
(
User
).
to
receive
(
:find_by_any_email
)
.
with
(
noteable
.
author_email
.
downcase
).
and_return
(
author
)
visit
project_commit_path
(
project
,
noteable
)
end
...
...
spec/services/notification_service_spec.rb
浏览文件 @
042cf15b
...
...
@@ -383,7 +383,7 @@ describe NotificationService, services: true do
before
do
build_team
(
note
.
project
)
reset_delivered_emails!
allow
_any_instance_of
(
Commit
).
to
receive
(
:author
).
and_return
(
@u_committer
)
allow
(
note
.
noteable
).
to
receive
(
:author
).
and_return
(
@u_committer
)
update_custom_notification
(
:new_note
,
@u_guest_custom
,
resource:
project
)
update_custom_notification
(
:new_note
,
@u_custom_global
)
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录