Commit f2251d19 authored by haseeb's avatar haseeb

fixes failing tests for full reference change

parent df948f8a
...@@ -19,7 +19,7 @@ feature 'Clicking toggle commit message link', js: true do ...@@ -19,7 +19,7 @@ feature 'Clicking toggle commit message link', js: true do
"Merge branch 'feature' into 'master'", "Merge branch 'feature' into 'master'",
merge_request.title, merge_request.title,
"Closes #{issue_1.to_reference} and #{issue_2.to_reference}", "Closes #{issue_1.to_reference} and #{issue_2.to_reference}",
"See merge request #{merge_request.to_reference}" "See merge request #{merge_request.to_reference(full: true)}"
].join("\n\n") ].join("\n\n")
end end
let(:message_with_description) do let(:message_with_description) do
...@@ -27,7 +27,7 @@ feature 'Clicking toggle commit message link', js: true do ...@@ -27,7 +27,7 @@ feature 'Clicking toggle commit message link', js: true do
"Merge branch 'feature' into 'master'", "Merge branch 'feature' into 'master'",
merge_request.title, merge_request.title,
merge_request.description, merge_request.description,
"See merge request #{merge_request.to_reference}" "See merge request #{merge_request.to_reference(full: true)}"
].join("\n\n") ].join("\n\n")
end end
......
...@@ -604,7 +604,7 @@ describe MergeRequest do ...@@ -604,7 +604,7 @@ describe MergeRequest do
request = build_stubbed(:merge_request) request = build_stubbed(:merge_request)
expect(request.merge_commit_message) expect(request.merge_commit_message)
.to match("See merge request #{request.to_reference}") .to match("See merge request #{request.to_reference(full: true)}")
end end
it 'excludes multiple linebreak runs when description is blank' do it 'excludes multiple linebreak runs when description is blank' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment