diff options
| -rw-r--r-- | spec/support/wait_for_ajax.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/spec/support/wait_for_ajax.rb b/spec/support/wait_for_ajax.rb index 0f9dc2dee75..d10c265c336 100644 --- a/spec/support/wait_for_ajax.rb +++ b/spec/support/wait_for_ajax.rb @@ -6,10 +6,12 @@ module WaitForAjax end def finished_all_ajax_requests? + return true unless javascript_test? + page.evaluate_script('jQuery.active').zero? end def javascript_test? - [:selenium, :webkit, :chrome, :poltergeist].include?(Capybara.current_driver) + Capybara.current_driver == Capybara.javascript_driver end end |