diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-03-21 15:25:54 +0000 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-03-21 23:33:54 +0800 |
| commit | 9dd80963f6a954c6921236b409b12f9b640988a1 (patch) | |
| tree | 8837a25b1c5e74b50e4e7ee4d23aea7e684ee49e | |
| parent | ed8199973073ab859f0f13eb25705876f40ec86d (diff) | |
| download | gitlab-ce-9dd80963f6a954c6921236b409b12f9b640988a1.tar.gz | |
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
| -rw-r--r-- | app/views/projects/merge_requests/_new_compare.html.haml | 2 | ||||
| -rw-r--r-- | spec/features/merge_requests/create_new_mr_spec.rb | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/app/views/projects/merge_requests/_new_compare.html.haml b/app/views/projects/merge_requests/_new_compare.html.haml index ad14b4e583e..8d134aaac67 100644 --- a/app/views/projects/merge_requests/_new_compare.html.haml +++ b/app/views/projects/merge_requests/_new_compare.html.haml @@ -21,7 +21,7 @@ selected: f.object.source_project_id .merge-request-select.dropdown = f.hidden_field :source_branch - = dropdown_toggle local_assigns.fetch(f.object.source_branch, "Select source branch"), { toggle: "dropdown", field_name: "#{f.object_name}[source_branch]" }, { toggle_class: "js-compare-dropdown js-source-branch" } + = dropdown_toggle f.object.source_branch || "Select source branch", { toggle: "dropdown", field_name: "#{f.object_name}[source_branch]" }, { toggle_class: "js-compare-dropdown js-source-branch" } .dropdown-menu.dropdown-menu-selectable.dropdown-source-branch = dropdown_title("Select source branch") = dropdown_filter("Search branches") 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' }) |