Commit 4f12309c authored by Sean McGivern's avatar Sean McGivern

Merge branch '27632_fix_mr_widget_url' into 'master'

Fix MR widget url

Closes #27632

See merge request !8989
parents 99fceff4 831b9335
...@@ -20,8 +20,8 @@ module MergeRequestsHelper ...@@ -20,8 +20,8 @@ module MergeRequestsHelper
end end
def mr_widget_refresh_url(mr) def mr_widget_refresh_url(mr)
if mr && mr.source_project if mr && mr.target_project
merge_widget_refresh_namespace_project_merge_request_url(mr.source_project.namespace, mr.source_project, mr) merge_widget_refresh_namespace_project_merge_request_url(mr.target_project.namespace, mr.target_project, mr)
else else
'' ''
end end
......
---
title: Fix MR widget url
merge_request: 8989
author:
...@@ -63,9 +63,11 @@ describe MergeRequestsHelper do ...@@ -63,9 +63,11 @@ describe MergeRequestsHelper do
end end
end end
describe 'mr_widget_refresh_url' do describe '#mr_widget_refresh_url' do
let(:project) { create(:empty_project) } let(:guest) { create(:user) }
let(:merge_request) { create(:merge_request, source_project: project) } let(:project) { create(:project, :public) }
let(:project_fork) { Projects::ForkService.new(project, guest).execute }
let(:merge_request) { create(:merge_request, source_project: project_fork, target_project: project) }
it 'returns correct url for MR' do it 'returns correct url for MR' do
expected_url = "#{project.path_with_namespace}/merge_requests/#{merge_request.iid}/merge_widget_refresh" expected_url = "#{project.path_with_namespace}/merge_requests/#{merge_request.iid}/merge_widget_refresh"
...@@ -74,7 +76,7 @@ describe MergeRequestsHelper do ...@@ -74,7 +76,7 @@ describe MergeRequestsHelper do
end end
it 'returns empty string for nil' do it 'returns empty string for nil' do
expect(mr_widget_refresh_url(nil)).to end_with('') expect(mr_widget_refresh_url(nil)).to eq('')
end end
end end
end end
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