diff options
Diffstat (limited to 'spec/features/merge_request/user_sees_merge_button_depending_on_unresolved_discussions_spec.rb')
-rw-r--r-- | spec/features/merge_request/user_sees_merge_button_depending_on_unresolved_discussions_spec.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/spec/features/merge_request/user_sees_merge_button_depending_on_unresolved_discussions_spec.rb b/spec/features/merge_request/user_sees_merge_button_depending_on_unresolved_discussions_spec.rb index 9955c13b769..5843585a95c 100644 --- a/spec/features/merge_request/user_sees_merge_button_depending_on_unresolved_discussions_spec.rb +++ b/spec/features/merge_request/user_sees_merge_button_depending_on_unresolved_discussions_spec.rb @@ -22,7 +22,10 @@ RSpec.describe 'Merge request > User sees merge button depending on unresolved t context 'with unresolved threads' do it 'does not allow to merge' do expect(page).not_to have_button('Merge', exact: true) - expect(page).to have_content('all threads must be resolved') + + click_button 'Expand merge checks' + + expect(page).to have_content('Unresolved discussions must be resolved') end end |