diff options
author | Jacob Schatz <jschatz@gitlab.com> | 2017-12-07 20:55:10 +0000 |
---|---|---|
committer | Jacob Schatz <jschatz@gitlab.com> | 2017-12-07 20:55:10 +0000 |
commit | 52ee3e0e06b3666d5f8545ce9e7eba3342088b48 (patch) | |
tree | af1add5d734e57ac6e653735136098cb5b385f74 /spec/features/merge_requests/widget_spec.rb | |
parent | 10e8a5ea627cd1092b3c499fb47e80c8653ccd1c (diff) | |
parent | de3eabc5bf530dd95dafa77efc006c163aa6b1f0 (diff) | |
download | gitlab-ce-52ee3e0e06b3666d5f8545ce9e7eba3342088b48.tar.gz |
Merge branch 'acet-fix-branches-list-on-cherry-pick-modal-after-merge' into 'master'
Fix loading branches list on cherry pick modal after merge.
Closes #33894
See merge request gitlab-org/gitlab-ce!15306
Diffstat (limited to 'spec/features/merge_requests/widget_spec.rb')
-rw-r--r-- | spec/features/merge_requests/widget_spec.rb | 12 |
1 files changed, 12 insertions, 0 deletions
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 |