diff options
author | Fatih Acet <acetfatih@gmail.com> | 2017-12-01 16:18:59 +0100 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2017-12-04 21:12:35 +0100 |
commit | de3eabc5bf530dd95dafa77efc006c163aa6b1f0 (patch) | |
tree | 3540e85cb5990501952cb7807d3d2bcbc06b8608 | |
parent | f3a3bd50eafdcfcaeea21d6cfa0b8bbae7720fec (diff) | |
download | gitlab-ce-de3eabc5bf530dd95dafa77efc006c163aa6b1f0.tar.gz |
Fix loading branches list on cherry pick modal after merge.acet-fix-branches-list-on-cherry-pick-modal-after-merge
-rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js | 2 | ||||
-rw-r--r-- | spec/features/merge_requests/widget_spec.rb | 12 |
2 files changed, 14 insertions, 0 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js index 1274db2c4c8..9cb3edead86 100644 --- a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js +++ b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js @@ -1,3 +1,4 @@ +import Project from '~/project'; import SmartInterval from '~/smart_interval'; import Flash from '../flash'; import { @@ -140,6 +141,7 @@ export default { const el = document.createElement('div'); el.innerHTML = res.body; document.body.appendChild(el); + Project.initRefSwitcher(); } }) .catch(() => { diff --git a/spec/features/merge_requests/widget_spec.rb b/spec/features/merge_requests/widget_spec.rb index 2bad3b02250..3ee094c216e 100644 --- a/spec/features/merge_requests/widget_spec.rb +++ b/spec/features/merge_requests/widget_spec.rb @@ -63,6 +63,18 @@ describe 'Merge request', :js do expect(page).to have_selector('.accept-merge-request') expect(find('.accept-merge-request')['disabled']).not_to be(true) end + + it 'allows me to merge, see cherry-pick modal and load branches list' do + wait_for_requests + click_button 'Merge' + + wait_for_requests + click_link 'Cherry-pick' + page.find('.js-project-refs-dropdown').click + wait_for_requests + + expect(page.all('.js-cherry-pick-form .dropdown-content li').size).to be > 1 + end end context 'view merge request with external CI service' do |