diff options
| author | Stan Hu <stanhu@gmail.com> | 2017-05-16 14:11:35 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2017-05-16 14:11:35 -0700 |
| commit | 6b09ecbb5c3295404429fedc8e826ca9c1e92273 (patch) | |
| tree | 5fd149856fdd250fdcd67fb2e5b837d3f16a7e84 | |
| parent | 072de2c2ad8185d607ae64ba3bec320f4de83130 (diff) | |
| download | gitlab-ce-sh-disable-merge-worker-in-spec.tar.gz | |
Wait for all Vue resources to finish in merge immediately specsh-disable-merge-worker-in-spec
| -rw-r--r-- | spec/features/merge_requests/merge_immediately_with_pipeline_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/features/merge_requests/merge_immediately_with_pipeline_spec.rb b/spec/features/merge_requests/merge_immediately_with_pipeline_spec.rb index 545841bca4e..c102722d6db 100644 --- a/spec/features/merge_requests/merge_immediately_with_pipeline_spec.rb +++ b/spec/features/merge_requests/merge_immediately_with_pipeline_spec.rb @@ -39,7 +39,7 @@ feature 'Merge immediately', :feature, :js do expect(find('.accept-merge-request.btn-info')).to have_content('Merge in progress') - wait_for_ajax + wait_for_vue_resource end end end |