diff options
author | Stan Hu <stanhu@gmail.com> | 2017-05-16 13:54:41 -0700 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2017-05-16 13:54:41 -0700 |
commit | 072de2c2ad8185d607ae64ba3bec320f4de83130 (patch) | |
tree | 113095462a85dbad45210b6ef3eea76ac1970e9c | |
parent | 67312fceaa69abb2bc88aa62601625e9f6a62270 (diff) | |
download | gitlab-ce-072de2c2ad8185d607ae64ba3bec320f4de83130.tar.gz |
Disable Sidekiq in spec to prevent transient build failures
-rw-r--r-- | spec/features/merge_requests/merge_immediately_with_pipeline_spec.rb | 8 |
1 files changed, 5 insertions, 3 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 5820784f8e7..545841bca4e 100644 --- a/spec/features/merge_requests/merge_immediately_with_pipeline_spec.rb +++ b/spec/features/merge_requests/merge_immediately_with_pipeline_spec.rb @@ -34,11 +34,13 @@ feature 'Merge immediately', :feature, :js do page.within '.mr-widget-body' do find('.dropdown-toggle').click - click_link 'Merge immediately' + Sidekiq::Testing.fake! do + click_link 'Merge immediately' - expect(find('.accept-merge-request.btn-info')).to have_content('Merge in progress') + expect(find('.accept-merge-request.btn-info')).to have_content('Merge in progress') - wait_for_ajax + wait_for_ajax + end end end end |