summaryrefslogtreecommitdiff
path: root/spec/features/merge_requests
diff options
context:
space:
mode:
authorAdam Niedzielski <adamsunday@gmail.com>2016-11-21 15:16:57 +0100
committerAdam Niedzielski <adamsunday@gmail.com>2016-11-21 18:13:53 +0100
commit6bfa3c93ed49d65783de824e4e99fec79adedf4e (patch)
tree9839dee4feabf56505ebea4687bb6b4a1b77154d /spec/features/merge_requests
parente22514fd4c54ec05e3272afdba5cba27d5b70516 (diff)
downloadgitlab-ce-6bfa3c93ed49d65783de824e4e99fec79adedf4e.tar.gz
Warn that branch does not exist instead of saying that there is
nothing to merge in merge request page
Diffstat (limited to 'spec/features/merge_requests')
-rw-r--r--spec/features/merge_requests/deleted_source_branch_spec.rb30
1 files changed, 30 insertions, 0 deletions
diff --git a/spec/features/merge_requests/deleted_source_branch_spec.rb b/spec/features/merge_requests/deleted_source_branch_spec.rb
new file mode 100644
index 00000000000..778b3a90cf3
--- /dev/null
+++ b/spec/features/merge_requests/deleted_source_branch_spec.rb
@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+describe 'Deleted source branch', feature: true, js: true do
+ let(:user) { create(:user) }
+ let(:merge_request) { create(:merge_request) }
+
+ before do
+ login_as user
+ merge_request.project.team << [user, :master]
+ merge_request.update!(source_branch: 'this-branch-does-not-exist')
+ visit namespace_project_merge_request_path(
+ merge_request.project.namespace,
+ merge_request.project, merge_request
+ )
+ end
+
+ it 'shows a message about missing source branch' do
+ expect(page).to have_content(
+ 'Source branch this-branch-does-not-exist does not exist'
+ )
+ end
+
+ it 'hides Discussion, Commits and Changes tabs' do
+ within '.merge-request-details' do
+ expect(page).to have_no_content('Discussion')
+ expect(page).to have_no_content('Commits')
+ expect(page).to have_no_content('Changes')
+ end
+ end
+end