diff options
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 | 2 |
1 files changed, 1 insertions, 1 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 a85700fc721..2f7758143a1 100644 --- a/spec/features/merge_request/user_sees_merge_widget_spec.rb +++ b/spec/features/merge_request/user_sees_merge_widget_spec.rb @@ -373,7 +373,7 @@ RSpec.describe 'Merge request > User sees merge widget', :js do wait_for_requests page.within('.mr-widget-body') do - expect(page).to have_content('Fast-forward merge is not possible') + expect(page).to have_content('Merge Merge blocked: fast-forward merge is not possible. To merge this request, first rebase locally.') end end end |