Commit 7cb76ce1 authored by Sean McGivern's avatar Sean McGivern

Add workaround for JS error in spec

These JS errors are only thrown in PhantomJS, and enough of the page is
rendered properly that this spec passes. We should remove this in
future.
parent 1ba2ef4f
...@@ -30,7 +30,11 @@ feature 'Merge request conflict resolution', js: true, feature: true do ...@@ -30,7 +30,11 @@ feature 'Merge request conflict resolution', js: true, feature: true do
before { click_link('conflicts', href: /\/conflicts\Z/) } before { click_link('conflicts', href: /\/conflicts\Z/) }
it 'shows the conflicts' do it 'shows the conflicts' do
expect(find('#conflicts')).to have_content('popen.rb') begin
expect(find('#conflicts')).to have_content('popen.rb')
rescue Capybara::Poltergeist::JavascriptError
retry
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