From 9dd80963f6a954c6921236b409b12f9b640988a1 Mon Sep 17 00:00:00 2001 From: Filipa Lacerda Date: Tue, 21 Mar 2017 15:25:54 +0000 Subject: Merge branch 'source-branch-toggle-text' into 'master' Fixed source branch name not being in new merge request dropdown toggle Closes #29660 See merge request !10080 --- spec/features/merge_requests/create_new_mr_spec.rb | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'spec') diff --git a/spec/features/merge_requests/create_new_mr_spec.rb b/spec/features/merge_requests/create_new_mr_spec.rb index 0832a3656a8..8cc0996acab 100644 --- a/spec/features/merge_requests/create_new_mr_spec.rb +++ b/spec/features/merge_requests/create_new_mr_spec.rb @@ -46,6 +46,12 @@ feature 'Create New Merge Request', feature: true, js: true do end end + it 'populates source branch button' do + visit new_namespace_project_merge_request_path(project.namespace, project, change_branches: true, merge_request: { target_branch: 'master', source_branch: 'fix' }) + + expect(find('.js-source-branch')).to have_content('fix') + end + it 'allows to change the diff view' do visit new_namespace_project_merge_request_path(project.namespace, project, merge_request: { target_branch: 'master', source_branch: 'fix' }) -- cgit v1.2.3