Commit e84f959a authored by Sean McGivern's avatar Sean McGivern Committed by Alfredo Sumaran

Fix editor spec

parent 4178ddee
...@@ -54,6 +54,7 @@ feature 'Merge request conflict resolution', js: true, feature: true do ...@@ -54,6 +54,7 @@ feature 'Merge request conflict resolution', js: true, feature: true do
click_button 'Commit conflict resolution' click_button 'Commit conflict resolution'
wait_for_ajax wait_for_ajax
expect(page).to have_content('All merge conflicts were resolved') expect(page).to have_content('All merge conflicts were resolved')
merge_request.reload_diff
click_on 'Changes' click_on 'Changes'
wait_for_ajax wait_for_ajax
......
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