Fix editor spec

e84f959a · Sean McGivern · Alfredo Sumaran · 4178ddee · e84f959a
Commit e84f959a authored Sep 26, 2016 by Sean McGivern Committed by Alfredo Sumaran Oct 13, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

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

No files found.
--- a/spec/features/merge_requests/conflicts_spec.rb
+++ b/spec/features/merge_requests/conflicts_spec.rb
@@ -54,6 +54,7 @@ feature 'Merge request conflict resolution', js: true, feature: true do
          click_button 'Commit conflict resolution'
          wait_for_ajax
          expect(page).to have_content('All merge conflicts were resolved')
+          merge_request.reload_diff

          click_on 'Changes'
          wait_for_ajax