Fix editor spec

2016-09-26 15:49:04 +01:00 · 2016-09-26 15:49:04 +01:00 · e84f959ae4
parent 4178ddee18
commit e84f959ae4
1 changed files with 1 additions and 0 deletions
--- 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