diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-18 13:34:06 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-18 13:34:06 +0300 |
commit | 859a6fb938bb9ee2a317c46dfa4fcc1af49608f0 (patch) | |
tree | d7f2700abe6b4ffcb2dcfc80631b2d87d0609239 /spec/features/merge_request/user_sees_merge_widget_spec.rb | |
parent | 446d496a6d000c73a304be52587cd9bbc7493136 (diff) |
Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42
Diffstat (limited to 'spec/features/merge_request/user_sees_merge_widget_spec.rb')
-rw-r--r-- | spec/features/merge_request/user_sees_merge_widget_spec.rb | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/spec/features/merge_request/user_sees_merge_widget_spec.rb b/spec/features/merge_request/user_sees_merge_widget_spec.rb index c2b2ada47be..0854a8b9fb7 100644 --- a/spec/features/merge_request/user_sees_merge_widget_spec.rb +++ b/spec/features/merge_request/user_sees_merge_widget_spec.rb @@ -77,15 +77,26 @@ RSpec.describe 'Merge request > User sees merge widget', :js do end it 'allows me to merge, see cherry-pick modal and load branches list', :sidekiq_might_not_need_inline do + modal_selector = '[data-testid="modal-commit"]' + 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 + click_button 'Cherry-pick' + + page.within(modal_selector) do + click_button 'master' + end + + page.within("#{modal_selector} .dropdown-menu") do + find('[data-testid="dropdown-search-box"]').set('') + + wait_for_requests + + expect(page.all('[data-testid="dropdown-item"]').size).to be > 1 + end end end @@ -319,7 +330,7 @@ RSpec.describe 'Merge request > User sees merge widget', :js do wait_for_requests page.within('.mr-section-container') do - expect(page).to have_content('Merge failed: Something went wrong') + expect(page).to have_content('Something went wrong.') end end end @@ -340,7 +351,7 @@ RSpec.describe 'Merge request > User sees merge widget', :js do wait_for_requests page.within('.mr-section-container') do - expect(page).to have_content('Merge failed: Something went wrong') + expect(page).to have_content('Something went wrong.') end end end @@ -377,7 +388,7 @@ RSpec.describe 'Merge request > User sees merge widget', :js do click_button 'Merge' page.within('.mr-widget-body') do - expect(page).to have_content('Conflicts detected during merge') + expect(page).to have_content('An error occurred while merging') end end end |