Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
2fec4183
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,发现更多精彩内容 >>
未验证
提交
2fec4183
编写于
6月 14, 2018
作者:
M
Mario de la Ossa
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ChatNotificationService - fix sending tag notifications when "only default branch" enabled
上级
fd93d8f0
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
70 addition
and
17 deletion
+70
-17
app/models/project_services/chat_notification_service.rb
app/models/project_services/chat_notification_service.rb
+1
-0
changelogs/unreleased/45487-slack-tag-push-notifs.yml
changelogs/unreleased/45487-slack-tag-push-notifs.yml
+5
-0
spec/support/shared_examples/slack_mattermost_notifications_shared_examples.rb
...xamples/slack_mattermost_notifications_shared_examples.rb
+64
-17
未找到文件。
app/models/project_services/chat_notification_service.rb
浏览文件 @
2fec4183
...
@@ -155,6 +155,7 @@ class ChatNotificationService < Service
...
@@ -155,6 +155,7 @@ class ChatNotificationService < Service
end
end
def
notify_for_ref?
(
data
)
def
notify_for_ref?
(
data
)
return
true
if
data
[
:object_kind
]
==
'tag_push'
return
true
if
data
.
dig
(
:object_attributes
,
:tag
)
return
true
if
data
.
dig
(
:object_attributes
,
:tag
)
return
true
unless
notify_only_default_branch?
return
true
unless
notify_only_default_branch?
...
...
changelogs/unreleased/45487-slack-tag-push-notifs.yml
0 → 100644
浏览文件 @
2fec4183
---
title
:
Fix chat service tag notifications not sending when only default branch enabled
merge_request
:
19864
author
:
type
:
fixed
spec/support/shared_examples/slack_mattermost_notifications_shared_examples.rb
浏览文件 @
2fec4183
...
@@ -245,6 +245,70 @@ RSpec.shared_examples 'slack or mattermost notifications' do
...
@@ -245,6 +245,70 @@ RSpec.shared_examples 'slack or mattermost notifications' do
end
end
end
end
describe
'Push events'
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:project
)
{
create
(
:project
,
:repository
,
creator:
user
)
}
before
do
allow
(
chat_service
).
to
receive_messages
(
project:
project
,
service_hook:
true
,
webhook:
webhook_url
)
WebMock
.
stub_request
(
:post
,
webhook_url
)
end
context
'only notify for the default branch'
do
context
'when enabled'
do
before
do
chat_service
.
notify_only_default_branch
=
true
end
it
'does not notify push events if they are not for the default branch'
do
ref
=
"
#{
Gitlab
::
Git
::
BRANCH_REF_PREFIX
}
test"
push_sample_data
=
Gitlab
::
DataBuilder
::
Push
.
build
(
project
,
user
,
nil
,
nil
,
ref
,
[])
chat_service
.
execute
(
push_sample_data
)
expect
(
WebMock
).
not_to
have_requested
(
:post
,
webhook_url
)
end
it
'notifies about push events for the default branch'
do
push_sample_data
=
Gitlab
::
DataBuilder
::
Push
.
build_sample
(
project
,
user
)
chat_service
.
execute
(
push_sample_data
)
expect
(
WebMock
).
to
have_requested
(
:post
,
webhook_url
).
once
end
it
'still notifies about pushed tags'
do
ref
=
"
#{
Gitlab
::
Git
::
TAG_REF_PREFIX
}
test"
push_sample_data
=
Gitlab
::
DataBuilder
::
Push
.
build
(
project
,
user
,
nil
,
nil
,
ref
,
[])
chat_service
.
execute
(
push_sample_data
)
expect
(
WebMock
).
to
have_requested
(
:post
,
webhook_url
).
once
end
end
context
'when disabled'
do
before
do
chat_service
.
notify_only_default_branch
=
false
end
it
'notifies about all push events'
do
ref
=
"
#{
Gitlab
::
Git
::
BRANCH_REF_PREFIX
}
test"
push_sample_data
=
Gitlab
::
DataBuilder
::
Push
.
build
(
project
,
user
,
nil
,
nil
,
ref
,
[])
chat_service
.
execute
(
push_sample_data
)
expect
(
WebMock
).
to
have_requested
(
:post
,
webhook_url
).
once
end
end
end
end
describe
"Note events"
do
describe
"Note events"
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:project
)
{
create
(
:project
,
:repository
,
creator:
user
)
}
let
(
:project
)
{
create
(
:project
,
:repository
,
creator:
user
)
}
...
@@ -394,23 +458,6 @@ RSpec.shared_examples 'slack or mattermost notifications' do
...
@@ -394,23 +458,6 @@ RSpec.shared_examples 'slack or mattermost notifications' do
expect
(
result
).
to
be_falsy
expect
(
result
).
to
be_falsy
end
end
it
'does not notify push events if they are not for the default branch'
do
ref
=
"
#{
Gitlab
::
Git
::
BRANCH_REF_PREFIX
}
test"
push_sample_data
=
Gitlab
::
DataBuilder
::
Push
.
build
(
project
,
user
,
nil
,
nil
,
ref
,
[])
chat_service
.
execute
(
push_sample_data
)
expect
(
WebMock
).
not_to
have_requested
(
:post
,
webhook_url
)
end
it
'notifies about push events for the default branch'
do
push_sample_data
=
Gitlab
::
DataBuilder
::
Push
.
build_sample
(
project
,
user
)
chat_service
.
execute
(
push_sample_data
)
expect
(
WebMock
).
to
have_requested
(
:post
,
webhook_url
).
once
end
end
end
context
'when disabled'
do
context
'when disabled'
do
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录