Skip to content
Snippets Groups Projects
Commit 6dc3efdd authored by Felipe Artur's avatar Felipe Artur
Browse files

Do not override incoming webhook channel for mattermost and slack

parent 47550d09
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -49,10 +49,12 @@ class ChatNotificationService < Service
 
return false unless message
 
opt = {}
channel_name = get_channel_field(object_kind).presence || channel
 
opt[:channel] = get_channel_field(object_kind).presence || channel || default_channel
opt = {}
opt[:channel] = channel_name if channel_name
opt[:username] = username if username
notifier = Slack::Notifier.new(webhook, opt)
notifier.ping(message.pretext, attachments: message.attachments, fallback: message.fallback)
 
Loading
Loading
@@ -71,7 +73,7 @@ class ChatNotificationService < Service
fields.reject { |field| field[:name].end_with?('channel') }
end
 
def default_channel
def default_channel_placeholder
raise NotImplementedError
end
 
Loading
Loading
@@ -103,7 +105,7 @@ class ChatNotificationService < Service
 
def build_event_channels
supported_events.reduce([]) do |channels, event|
channels << { type: 'text', name: event_channel_name(event), placeholder: default_channel }
channels << { type: 'text', name: event_channel_name(event), placeholder: default_channel_placeholder }
end
end
 
Loading
Loading
Loading
Loading
@@ -35,7 +35,7 @@ class MattermostService < ChatNotificationService
]
end
 
def default_channel
def default_channel_placeholder
"#town-square"
end
end
Loading
Loading
@@ -34,7 +34,7 @@ class SlackService < ChatNotificationService
]
end
 
def default_channel
def default_channel_placeholder
"#general"
end
end
---
title: Do not override incoming webhook for mattermost and slack
merge_request:
author:
Loading
Loading
@@ -105,7 +105,7 @@ RSpec.shared_examples 'slack or mattermost notifications' do
allow(chat_service).to receive(:username).and_return(username)
 
expect(Slack::Notifier).to receive(:new).
with(webhook_url, username: username, channel: chat_service.default_channel).
with(webhook_url, username: username).
and_return(
double(:slack_service).as_null_object
)
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment