Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
255162e1
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 搜索 >>
提交
255162e1
编写于
7月 26, 2016
作者:
R
Rémy Coutable
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Little refactor, add specs, and a CHANGELOG entry
Signed-off-by:
N
Rémy Coutable
<
remy@rymai.me
>
上级
189e3b57
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
31 addition
and
9 deletion
+31
-9
CHANGELOG
CHANGELOG
+1
-0
app/models/project_services/hipchat_service.rb
app/models/project_services/hipchat_service.rb
+6
-3
spec/models/project_services/hipchat_service_spec.rb
spec/models/project_services/hipchat_service_spec.rb
+24
-6
未找到文件。
CHANGELOG
浏览文件 @
255162e1
...
...
@@ -9,6 +9,7 @@ v 8.11.0 (unreleased)
- Add green outline to New Branch button. !5447 (winniehell)
- Retrieve rendered HTML from cache in one request
- Nokogiri's various parsing methods are now instrumented
- Add build event color in HipChat messages (David Eisner)
- Make fork counter always clickable. !5463 (winniehell)
- Remove `search_id` of labels dropdown filter to fix 'Missleading URI for labels in Merge Requests and Issues view'. !5368 (Scott Le)
- Load project invited groups and members eagerly in `ProjectTeam#fetch_members`
...
...
app/models/project_services/hipchat_service.rb
浏览文件 @
255162e1
...
...
@@ -67,7 +67,7 @@ class HipchatService < Service
@gate
||=
HipChat
::
Client
.
new
(
token
,
options
)
end
def
message_options
(
data
)
def
message_options
(
data
=
nil
)
{
notify:
notify
.
present?
&&
notify
==
'1'
,
color:
build_status_color
(
data
)
||
color
||
'yellow'
}
end
...
...
@@ -241,11 +241,14 @@ class HipchatService < Service
end
def
build_status_color
(
data
)
if
data
[
:commit
][
:status
]
==
'success'
return
unless
data
&&
data
[
:object_kind
]
==
'build'
case
data
[
:commit
][
:status
]
when
'success'
'green'
else
'red'
end
if
data
[
:object_kind
]
==
'build'
end
end
def
project_name
...
...
spec/models/project_services/hipchat_service_spec.rb
浏览文件 @
255162e1
...
...
@@ -340,18 +340,36 @@ describe HipchatService, models: true do
end
context
"#message_options"
do
it
"
should be
set to the defaults"
do
expect
(
hipchat
.
send
(
:message_options
)).
to
eq
({
notify:
false
,
color:
'yellow'
})
it
"
is
set to the defaults"
do
expect
(
hipchat
.
__send__
(
:message_options
)).
to
eq
({
notify:
false
,
color:
'yellow'
})
end
it
"s
hould set notfi
y to true"
do
it
"s
ets notif
y to true"
do
allow
(
hipchat
).
to
receive
(
:notify
).
and_return
(
'1'
)
expect
(
hipchat
.
send
(
:message_options
)).
to
eq
({
notify:
true
,
color:
'yellow'
})
expect
(
hipchat
.
__send__
(
:message_options
)).
to
eq
({
notify:
true
,
color:
'yellow'
})
end
it
"s
hould set
the color"
do
it
"s
ets
the color"
do
allow
(
hipchat
).
to
receive
(
:color
).
and_return
(
'red'
)
expect
(
hipchat
.
send
(
:message_options
)).
to
eq
({
notify:
false
,
color:
'red'
})
expect
(
hipchat
.
__send__
(
:message_options
)).
to
eq
({
notify:
false
,
color:
'red'
})
end
context
'with a successful build'
do
it
'uses the green color'
do
build_data
=
{
object_kind:
'build'
,
commit:
{
status:
'success'
}
}
expect
(
hipchat
.
__send__
(
:message_options
,
build_data
)).
to
eq
({
notify:
false
,
color:
'green'
})
end
end
context
'with a failed build'
do
it
'uses the red color'
do
build_data
=
{
object_kind:
'build'
,
commit:
{
status:
'failed'
}
}
expect
(
hipchat
.
__send__
(
:message_options
,
build_data
)).
to
eq
({
notify:
false
,
color:
'red'
})
end
end
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录