summaryrefslogtreecommitdiff
path: root/spec/models/project_services/chat_message/merge_message_spec.rb
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2016-12-19 13:34:03 +0100
committerKamil Trzcinski <ayufan@ayufan.eu>2016-12-19 13:34:03 +0100
commitb1ccf99e87605216f7d5733d6a4ffb4530d4cfc9 (patch)
treed54f27e2e0ec8808b472ca202c27a4e5064013ce /spec/models/project_services/chat_message/merge_message_spec.rb
parente6842ff5643c7fc88a65af24b56682f47f4be2de (diff)
downloadgitlab-ce-b1ccf99e87605216f7d5733d6a4ffb4530d4cfc9.tar.gz
Fix previously reverted spec failures
Diffstat (limited to 'spec/models/project_services/chat_message/merge_message_spec.rb')
-rw-r--r--spec/models/project_services/chat_message/merge_message_spec.rb12
1 files changed, 6 insertions, 6 deletions
diff --git a/spec/models/project_services/chat_message/merge_message_spec.rb b/spec/models/project_services/chat_message/merge_message_spec.rb
index 07c414c6ca4..cc154112e90 100644
--- a/spec/models/project_services/chat_message/merge_message_spec.rb
+++ b/spec/models/project_services/chat_message/merge_message_spec.rb
@@ -10,14 +10,14 @@ describe ChatMessage::MergeMessage, models: true do
username: 'test.user'
},
project_name: 'project_name',
- project_url: 'somewhere.com',
+ project_url: 'http://somewhere.com',
object_attributes: {
title: "Issue title\nSecond line",
id: 10,
iid: 100,
assignee_id: 1,
- url: 'url',
+ url: 'http://url.com',
state: 'opened',
description: 'issue description',
source_branch: 'source_branch',
@@ -31,8 +31,8 @@ describe ChatMessage::MergeMessage, models: true do
context 'open' do
it 'returns a message regarding opening of merge requests' do
expect(subject.pretext).to eq(
- 'test.user opened <somewhere.com/merge_requests/100|merge request !100> '\
- 'in <somewhere.com|project_name>: *Issue title*')
+ 'test.user opened <http://somewhere.com/merge_requests/100|merge request !100> '\
+ 'in <http://somewhere.com|project_name>: *Issue title*')
expect(subject.attachments).to be_empty
end
end
@@ -43,8 +43,8 @@ describe ChatMessage::MergeMessage, models: true do
end
it 'returns a message regarding closing of merge requests' do
expect(subject.pretext).to eq(
- 'test.user closed <somewhere.com/merge_requests/100|merge request !100> '\
- 'in <somewhere.com|project_name>: *Issue title*')
+ 'test.user closed <http://somewhere.com/merge_requests/100|merge request !100> '\
+ 'in <http://somewhere.com|project_name>: *Issue title*')
expect(subject.attachments).to be_empty
end
end