summaryrefslogtreecommitdiff
path: root/spec/features/merge_requests
diff options
context:
space:
mode:
authorBryce Johnson <bryce@gitlab.com>2017-05-23 16:24:49 -0400
committerBryce Johnson <bryce@gitlab.com>2017-05-23 16:24:49 -0400
commit0eaa65d508eca7765e470018ab0d8006d0a8c9f8 (patch)
treecd6fa222bd402a8d3f32d145d35c440a9d7d54c7 /spec/features/merge_requests
parent92d290c97b14e95864a123b29fa28376415a8edf (diff)
downloadgitlab-ce-0eaa65d508eca7765e470018ab0d8006d0a8c9f8.tar.gz
Add spec for disabled Remove source branch checkbox.
Diffstat (limited to 'spec/features/merge_requests')
-rw-r--r--spec/features/merge_requests/created_from_fork_spec.rb15
1 files changed, 15 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 bf34c99b92a..a97768b757a 100644
--- a/spec/features/merge_requests/created_from_fork_spec.rb
+++ b/spec/features/merge_requests/created_from_fork_spec.rb
@@ -63,6 +63,21 @@ feature 'Merge request created from fork' do
end
end
+ context 'user can merge into source project but cannot push to fork' do
+ given(:user2) { create(:user) }
+
+ background do
+ project.team << [user2, :master]
+ logout
+ login_as user2
+ visit_merge_request(merge_request)
+ end
+
+ scenario 'user cannot remove source branch', js: true do
+ expect(page).to have_field('remove-source-branch-input', disabled: true)
+ end
+ end
+
def visit_merge_request(mr)
visit namespace_project_merge_request_path(project.namespace,
project, mr)