From cf3b0ca4d9525f43d276c55a77ed86a09304bcd4 Mon Sep 17 00:00:00 2001 From: Valery Sizov Date: Wed, 22 Mar 2017 15:18:00 +0200 Subject: [PATCH] Fix some random failures --- .../merge_requests/merge_immediately_with_pipeline_spec.rb | 2 ++ 1 file changed, 2 insertions(+) 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 0ceaf7bc830..79105b1ee46 100644 --- a/spec/features/merge_requests/merge_immediately_with_pipeline_spec.rb +++ b/spec/features/merge_requests/merge_immediately_with_pipeline_spec.rb @@ -35,6 +35,8 @@ feature 'Merge immediately', :feature, :js do click_link 'Merge Immediately' expect(find('.js-merge-when-pipeline-succeeds-button')).to have_content('Merge in progress') + + wait_for_ajax end end end