summaryrefslogtreecommitdiff
path: root/spec/features/merge_requests/merge_immediately_with_pipeline_spec.rb
diff options
context:
space:
mode:
Diffstat (limited to 'spec/features/merge_requests/merge_immediately_with_pipeline_spec.rb')
-rw-r--r--spec/features/merge_requests/merge_immediately_with_pipeline_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/features/merge_requests/merge_immediately_with_pipeline_spec.rb b/spec/features/merge_requests/merge_immediately_with_pipeline_spec.rb
index c102722d6db..c1d4d508e57 100644
--- a/spec/features/merge_requests/merge_immediately_with_pipeline_spec.rb
+++ b/spec/features/merge_requests/merge_immediately_with_pipeline_spec.rb
@@ -39,7 +39,7 @@ feature 'Merge immediately', :feature, :js do
expect(find('.accept-merge-request.btn-info')).to have_content('Merge in progress')
- wait_for_vue_resource
+ wait_for_requests
end
end
end