diff options
| author | Sean McGivern <sean@gitlab.com> | 2016-09-26 15:49:04 +0100 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-10-13 14:16:35 -0500 |
| commit | e84f959ae47e35eaebdc6c0adaf1e089326601ce (patch) | |
| tree | 2d52c2aa43edf3bb9b6faed65ba4bdfba8dc03e8 | |
| parent | 4178ddee18918c5186ba75aaf9b303138fb97b30 (diff) | |
| download | gitlab-ce-e84f959ae47e35eaebdc6c0adaf1e089326601ce.tar.gz | |
Fix editor spec
| -rw-r--r-- | spec/features/merge_requests/conflicts_spec.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/features/merge_requests/conflicts_spec.rb b/spec/features/merge_requests/conflicts_spec.rb index d2057aa2fe7..721360b207e 100644 --- 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 |