Wait for all Vue resources to finish in merge immediately spec

6b09ecbb · Stan Hu · 072de2c2 · 6b09ecbb
Commit 6b09ecbb authored May 16, 2017 by Stan Hu
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

spec/features/merge_requests/merge_immediately_with_pipeline_spec.rb ...es/merge_requests/merge_immediately_with_pipeline_spec.rb +1 -1

No files found.
--- 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