diff options
| author | Oswaldo Ferreira <oswaldo@gitlab.com> | 2017-05-17 15:25:13 -0300 |
|---|---|---|
| committer | Oswaldo Ferreira <oswaldo@gitlab.com> | 2017-05-22 20:39:49 -0300 |
| commit | 2338785ec9fcacc43ba2098ab1485fca292c06cc (patch) | |
| tree | 6a4bd9bed8d995c28bb1589ef861a92c517f6fac /spec/features/merge_requests/versions_spec.rb | |
| parent | 7f31768a7f1d311d7c8cedce045f5d918370b8c9 (diff) | |
| download | gitlab-ce-2338785ec9fcacc43ba2098ab1485fca292c06cc.tar.gz | |
Use wait_for_requests to wait all JS requestwait-for-ajax-handling-all-js-requests
Diffstat (limited to 'spec/features/merge_requests/versions_spec.rb')
| -rw-r--r-- | spec/features/merge_requests/versions_spec.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/features/merge_requests/versions_spec.rb b/spec/features/merge_requests/versions_spec.rb index 2b5b803946c..aef8ef20938 100644 --- a/spec/features/merge_requests/versions_spec.rb +++ b/spec/features/merge_requests/versions_spec.rb @@ -75,7 +75,7 @@ feature 'Merge Request versions', js: true, feature: true do find(".js-comment-button").click end - wait_for_ajax + wait_for_requests expect(page).to have_content("Typo, please fix") end @@ -126,7 +126,7 @@ feature 'Merge Request versions', js: true, feature: true do outdated_diff_note = create(:diff_note_on_merge_request, project: project, noteable: merge_request, position: position) visit current_url - wait_for_ajax + wait_for_requests expect(page).to have_css(".diffs .notes[data-discussion-id='#{outdated_diff_note.discussion_id}']") end @@ -144,7 +144,7 @@ feature 'Merge Request versions', js: true, feature: true do find(".js-comment-button").click end - wait_for_ajax + wait_for_requests expect(page).to have_content("Typo, please fix") end |