Fix some random failures

cf3b0ca4 · Valery Sizov · bb1620aa · cf3b0ca4
Commit cf3b0ca4 authored Mar 22, 2017 by Valery Sizov
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

spec/features/merge_requests/merge_immediately_with_pipeline_spec.rb ...es/merge_requests/merge_immediately_with_pipeline_spec.rb +2 -0

No files found.
--- 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