Commit d70f9c85 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'fix_some_random_failures' into 'master'

Fix some random failures

See merge request !10142
parents c62314ab cf3b0ca4
...@@ -35,6 +35,8 @@ feature 'Merge immediately', :feature, :js do ...@@ -35,6 +35,8 @@ feature 'Merge immediately', :feature, :js do
click_link 'Merge Immediately' click_link 'Merge Immediately'
expect(find('.js-merge-when-pipeline-succeeds-button')).to have_content('Merge in progress') expect(find('.js-merge-when-pipeline-succeeds-button')).to have_content('Merge in progress')
wait_for_ajax
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