Fix editor spec
This commit is contained in:
parent
4178ddee18
commit
e84f959ae4
|
@ -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
|
||||||
|
|
Loading…
Reference in New Issue