Commit 0a8289ca authored by Maxim Rydkin's avatar Maxim Rydkin

add link_to_if helper on target_branch link on Merge Request show page for...

add link_to_if helper on target_branch link on Merge Request show page for case of deleted target branch

add spec on #24507 bug description

add changelog entry

fix changelog

remove unnecessary js:true from specs

change spec title

add test for link to target branch before deletions

renamed spec about state of target branch link before and after deletion

some fixes into spec
parent e7b045ea
......@@ -31,7 +31,7 @@
%span.label-branch= source_branch_with_namespace(@merge_request)
%span into
= link_to @merge_request.target_branch, namespace_project_commits_path(@project.namespace, @project, @merge_request.target_branch)
= link_to_if @merge_request.target_branch_exists?, @merge_request.target_branch, namespace_project_commits_path(@project.namespace, @project, @merge_request.target_branch)
- if && @merge_request.diverged_from_target_branch?
%span (#{pluralize(@merge_request.diverged_commits_count, 'commit')} behind)
title: 'Remove unnecessary target branch link from MR page in case of deleted target branch'
merge_request: 7916
author: Rydkin Maxim
require 'spec_helper'
describe 'Target branch', feature: true do
let(:user) { create(:user) }
let(:merge_request) { create(:merge_request) }
let(:project) { merge_request.project }
def path_to_merge_request
project, merge_request
before do
login_as user << [user, :master]
it 'shows link to target branch' do
visit path_to_merge_request
expect(page).to have_link('feature', href: namespace_project_commits_path(project.namespace, project, merge_request.target_branch))
context 'when branch was deleted' do
before do, user).execute('feature')
visit path_to_merge_request
it 'shows a message about missing target branch' do
expect(page).to have_content(
'Target branch feature does not exist'
it 'does not show link to target branch' do
expect(page).not_to have_link('feature')
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