diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2017-08-16 12:31:47 +0000 |
|---|---|---|
| committer | Tim Zallmann <tzallmann@gitlab.com> | 2017-08-16 12:31:47 +0000 |
| commit | ee4528526e1bbf58f256c0fcc27873fcdf80daa4 (patch) | |
| tree | af07e1f0d30477c6b1ed5dab5bf411b417db2d49 /spec | |
| parent | 1998a4a10796a277b3e587e61a8299ce981c92d2 (diff) | |
| parent | 554afea059446384783f3c68c09ac56afa0e7d49 (diff) | |
| download | gitlab-ce-ee4528526e1bbf58f256c0fcc27873fcdf80daa4.tar.gz | |
Merge branch 'dispatcher-race-condition-fix' into 'master'
Fix race condition with dispatcher.js
See merge request !13377
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/features/merge_requests/conflicts_spec.rb | 10 | ||||
| -rw-r--r-- | spec/helpers/version_check_helper_spec.rb | 2 |
2 files changed, 8 insertions, 4 deletions
diff --git a/spec/features/merge_requests/conflicts_spec.rb b/spec/features/merge_requests/conflicts_spec.rb index 2c560632a1b..2d2c674f8fb 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' diff --git a/spec/helpers/version_check_helper_spec.rb b/spec/helpers/version_check_helper_spec.rb index 889fe441171..5eba03ef576 100644 --- a/spec/helpers/version_check_helper_spec.rb +++ b/spec/helpers/version_check_helper_spec.rb @@ -23,7 +23,7 @@ describe VersionCheckHelper do end it 'should have a js prefixed css class' do - expect(@image_tag).to match(/class="js-version-status-badge"/) + expect(@image_tag).to match(/class="js-version-status-badge lazy"/) end it 'should have a VersionCheck url as the src' do |