diff options
| author | Stan Hu <stanhu@gmail.com> | 2017-08-17 00:15:35 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2017-08-17 00:15:35 -0700 |
| commit | 3e75b7fa81bfecbcbdbd68374049a161606d408b (patch) | |
| tree | d88081ea410263556e5ba439fe0dfce691e9d095 /spec/features/merge_requests/conflicts_spec.rb | |
| parent | 541a082c9fdfdf8f3999fda894e5e1feb10158a8 (diff) | |
| parent | 36ba84cb94dd377a9995b5cdaba9021974fc0489 (diff) | |
| download | gitlab-ce-3e75b7fa81bfecbcbdbd68374049a161606d408b.tar.gz | |
Merge branch 'master' into sh-headless-chrome-support
Diffstat (limited to 'spec/features/merge_requests/conflicts_spec.rb')
| -rw-r--r-- | spec/features/merge_requests/conflicts_spec.rb | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/spec/features/merge_requests/conflicts_spec.rb b/spec/features/merge_requests/conflicts_spec.rb index 19a38afb410..70937666334 100644 --- a/spec/features/merge_requests/conflicts_spec.rb +++ b/spec/features/merge_requests/conflicts_spec.rb @@ -28,11 +28,12 @@ feature 'Merge request conflict resolution', js: true do end click_button 'Commit conflict resolution' - wait_for_requests expect(page).to have_content('All merge conflicts were resolved') merge_request.reload_diff + wait_for_requests + click_on 'Changes' wait_for_requests @@ -69,10 +70,12 @@ feature 'Merge request conflict resolution', js: true do end click_button 'Commit conflict resolution' - wait_for_requests + expect(page).to have_content('All merge conflicts were resolved') merge_request.reload_diff + wait_for_requests + click_on 'Changes' wait_for_requests @@ -140,12 +143,13 @@ feature 'Merge request conflict resolution', js: true do end click_button 'Commit conflict resolution' - wait_for_requests expect(page).to have_content('All merge conflicts were resolved') merge_request.reload_diff + wait_for_requests + click_on 'Changes' wait_for_requests click_link 'Expand all' |