summaryrefslogtreecommitdiff
path: root/spec/features/merge_request/user_sees_merge_widget_spec.rb
diff options
context:
space:
mode:
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.rb2
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 0cb4107c21d..d9b5ec17a4a 100644
--- a/spec/features/merge_request/user_sees_merge_widget_spec.rb
+++ b/spec/features/merge_request/user_sees_merge_widget_spec.rb
@@ -445,7 +445,7 @@ RSpec.describe 'Merge request > User sees merge widget', :js do
wait_for_requests
expect(page).not_to have_button('Merge')
- expect(page).to have_content('This merge request is in the process of being merged')
+ expect(page).to have_content('Merging!')
end
end