kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Disable Sidekiq in spec to prevent transient build failures

Browse source
This commit is contained in:
Stan Hu 2017-05-16 13:54:41 -07:00
parent 67312fceaa
commit 072de2c2ad
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
spec/features/merge_requests/merge_immediately_with_pipeline_spec.rb
View file

@ -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