diff options
author | Robert Speicher <rspeicher@gmail.com> | 2017-04-19 18:55:02 -0400 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2017-04-19 20:28:32 -0400 |
commit | 6b298d06b436b9c0f256176b92cc1947fd02e299 (patch) | |
tree | 7d99dc22789a4b20773b24dc74318bc51dc43cf7 /spec | |
parent | 5647d5deaf5a05da1cb0a75984859c61682a1c1b (diff) | |
download | gitlab-ce-6b298d06b436b9c0f256176b92cc1947fd02e299.tar.gz |
Return early from `finished_all_ajax_requests?` when jQuery is undefinedrs-rename-login_as
Diffstat (limited to 'spec')
-rw-r--r-- | spec/support/wait_for_ajax.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/support/wait_for_ajax.rb b/spec/support/wait_for_ajax.rb index d10c265c336..508de2ee8e1 100644 --- a/spec/support/wait_for_ajax.rb +++ b/spec/support/wait_for_ajax.rb @@ -7,6 +7,7 @@ module WaitForAjax def finished_all_ajax_requests? return true unless javascript_test? + return true if page.evaluate_script('typeof jQuery === "undefined"') page.evaluate_script('jQuery.active').zero? end |