Fix random failure caused by spec/features/merge_requests/merge_immediately_with_pipeline_spec.rb

3b25d1c7 · Valery Sizov · 8b879993 · 3b25d1c7
Commit 3b25d1c7 authored Mar 22, 2017 by Valery Sizov
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

spec/features/merge_requests/merge_immediately_with_pipeline_spec.rb ...es/merge_requests/merge_immediately_with_pipeline_spec.rb +1 -1

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
@@ -32,7 +32,7 @@ feature 'Merge immediately', :feature, :js do
      page.within '.mr-widget-body' do
        find('.dropdown-toggle').click

-        click_link 'Merge Immediately'
+        Sidekiq::Testing.fake! { click_link 'Merge Immediately' }

        expect(find('.js-merge-when-pipeline-succeeds-button')).to have_content('Merge in progress')
      end