summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2016-10-19 17:13:04 +0100
committerNick Thomas <nick@gitlab.com>2016-10-20 12:24:27 +0100
commit374071321d0cfb7a161ec38e85e27e1d46ae7c9a (patch)
tree4fd27bd59afc80546d09190e2245284942e080bd /spec
parente6f515ecbed85b204e8f7bc9934b0bf208a0ea4c (diff)
downloadgitlab-ce-374071321d0cfb7a161ec38e85e27e1d46ae7c9a.tar.gz
Fix the merge request view when source projects or branches are removed
Diffstat (limited to 'spec')
-rw-r--r--spec/features/merge_requests/created_from_fork_spec.rb14
1 files changed, 14 insertions, 0 deletions
diff --git a/spec/features/merge_requests/created_from_fork_spec.rb b/spec/features/merge_requests/created_from_fork_spec.rb
index a506624b30d..cfc1244429f 100644
--- a/spec/features/merge_requests/created_from_fork_spec.rb
+++ b/spec/features/merge_requests/created_from_fork_spec.rb
@@ -25,6 +25,20 @@ feature 'Merge request created from fork' do
expect(page).to have_content 'Test merge request'
end
+ context 'source project is deleted' do
+ background do
+ MergeRequests::MergeService.new(project, user).execute(merge_request)
+ fork_project.destroy!
+ end
+
+ scenario 'user can access merge request' do
+ visit_merge_request(merge_request)
+
+ expect(page).to have_content 'Test merge request'
+ expect(page).to have_content "(removed):#{merge_request.source_branch}"
+ end
+ end
+
context 'pipeline present in source project' do
include WaitForAjax