Commit a14d75ff authored by Robert Speicher's avatar Robert Speicher

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
parents c7a7fc17 6b09ecbb
...@@ -34,11 +34,13 @@ feature 'Merge immediately', :feature, :js do ...@@ -34,11 +34,13 @@ feature 'Merge immediately', :feature, :js do
page.within '.mr-widget-body' do page.within '.mr-widget-body' do
find('.dropdown-toggle').click 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 end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment