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.

Add workaround for JS error in spec
7cb76ce1 · Sean McGivern · 1ba2ef4f · 7cb76ce1
Commit 7cb76ce1 authored Aug 17, 2016 by Sean McGivern
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

conflicts_spec.rb spec/features/merge_requests/conflicts_spec.rb +5 -1

No files found.
--- a/spec/features/merge_requests/conflicts_spec.rb
+++ b/spec/features/merge_requests/conflicts_spec.rb
@@ -30,7 +30,11 @@ feature 'Merge request conflict resolution', js: true, feature: true do
      before { click_link('conflicts', href: /\/conflicts\Z/) }

      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