summaryrefslogtreecommitdiff
path: root/spec/support/wait_for_ajax.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-10-18 18:55:11 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-10-18 18:55:11 +0300
commit82033e2edc43b34823625f886f229e5ae944d4d6 (patch)
tree9424eac6efc01c8f348e87c761246a00f4dc67c2 /spec/support/wait_for_ajax.rb
parent146e0cbc4dfb857e0eb44777c40da5df56f376e0 (diff)
downloadgitlab-ce-82033e2edc43b34823625f886f229e5ae944d4d6.tar.gz
Wait for ajax for every merge request spinach testdz-spinach-wait-ajax
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'spec/support/wait_for_ajax.rb')
-rw-r--r--spec/support/wait_for_ajax.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/spec/support/wait_for_ajax.rb b/spec/support/wait_for_ajax.rb
index b90fc112671..0f9dc2dee75 100644
--- a/spec/support/wait_for_ajax.rb
+++ b/spec/support/wait_for_ajax.rb
@@ -8,4 +8,8 @@ module WaitForAjax
def finished_all_ajax_requests?
page.evaluate_script('jQuery.active').zero?
end
+
+ def javascript_test?
+ [:selenium, :webkit, :chrome, :poltergeist].include?(Capybara.current_driver)
+ end
end