summaryrefslogtreecommitdiff
path: root/spec/models/project_services/slack_service/merge_message_spec.rb
diff options
context:
space:
mode:
Diffstat (limited to 'spec/models/project_services/slack_service/merge_message_spec.rb')
-rw-r--r--spec/models/project_services/slack_service/merge_message_spec.rb13
1 files changed, 7 insertions, 6 deletions
diff --git a/spec/models/project_services/slack_service/merge_message_spec.rb b/spec/models/project_services/slack_service/merge_message_spec.rb
index 25d03cd8736..aeb408aa766 100644
--- a/spec/models/project_services/slack_service/merge_message_spec.rb
+++ b/spec/models/project_services/slack_service/merge_message_spec.rb
@@ -6,13 +6,14 @@ describe SlackService::MergeMessage do
let(:args) {
{
user: {
- username: 'username'
+ name: 'Test User',
+ username: 'Test User'
},
project_name: 'project_name',
project_url: 'somewhere.com',
object_attributes: {
- title: 'Issue title',
+ title: "Issue title\nSecond line",
id: 10,
iid: 100,
assignee_id: 1,
@@ -30,8 +31,8 @@ describe SlackService::MergeMessage do
context 'open' do
it 'returns a message regarding opening of merge requests' do
expect(subject.pretext).to eq(
- 'username opened merge request <somewhere.com/merge_requests/100|#100> '\
- 'in <somewhere.com|project_name>')
+ 'Test User opened <somewhere.com/merge_requests/100|merge request #100> '\
+ 'in <somewhere.com|project_name>: *Issue title*')
expect(subject.attachments).to be_empty
end
end
@@ -42,8 +43,8 @@ describe SlackService::MergeMessage do
end
it 'returns a message regarding closing of merge requests' do
expect(subject.pretext).to eq(
- 'username closed merge request <somewhere.com/merge_requests/100|#100> '\
- 'in <somewhere.com|project_name>')
+ 'Test User closed <somewhere.com/merge_requests/100|merge request #100> '\
+ 'in <somewhere.com|project_name>: *Issue title*')
expect(subject.attachments).to be_empty
end
end