kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch '27632_fix_mr_widget_url' into 'master' 

Fix MR widget url

Closes #27632

See merge request !8989
This commit is contained in:
Sean McGivern 2017-02-07 14:00:29 +00:00
parent 99fceff4f9 831b9335ba
commit 4f12309cc6
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/helpers/merge_requests_helper.rb
View File

@ -20,8 +20,8 @@ module MergeRequestsHelper
end
def mr_widget_refresh_url(mr)
if mr && mr.source_project
merge_widget_refresh_namespace_project_merge_request_url(mr.source_project.namespace, mr.source_project, mr)
if mr && mr.target_project
merge_widget_refresh_namespace_project_merge_request_url(mr.target_project.namespace, mr.target_project, mr)
else
''
end

4
changelogs/unreleased/27632_fix_mr_widget_url.yml Normal file
View File

@ -0,0 +1,4 @@
---
title: Fix MR widget url
merge_request: 8989
author:

10
spec/helpers/merge_requests_helper_spec.rb
View File

@ -63,9 +63,11 @@ describe MergeRequestsHelper do
end
end
describe 'mr_widget_refresh_url' do
let(:project) { create(:empty_project) }
let(:merge_request) { create(:merge_request, source_project: project) }
describe '#mr_widget_refresh_url' do
let(:guest) { create(:user) }
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
expected_url = "#{project.path_with_namespace}/merge_requests/#{merge_request.iid}/merge_widget_refresh"
@ -74,7 +76,7 @@ describe MergeRequestsHelper do
end
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