diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-05-16 22:20:03 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-05-16 22:20:03 +0000 |
| commit | a14d75ff59b2803452b5ede9498514545303ff1e (patch) | |
| tree | 868c427f66e92469507c2feef94aee9befad77d0 | |
| parent | c7a7fc175d4004ec48aaef2f605043f92cbd941e (diff) | |
| parent | 6b09ecbb5c3295404429fedc8e826ca9c1e92273 (diff) | |
| download | gitlab-ce-a14d75ff59b2803452b5ede9498514545303ff1e.tar.gz | |
Merge branch 'sh-disable-merge-worker-in-spec' into 'master'
Disable Sidekiq in merge immediately spec to prevent transient build failures
See merge request !11422
| -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..c102722d6db 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_vue_resource + end end end end |