diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-03-16 12:16:49 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-03-16 12:16:49 +0300 |
| commit | cacd3373ff7d5f3c8cc5774527e2474f9a28fc92 (patch) | |
| tree | 58e4426905d64660d8c04020514a86bdb4306264 /spec/support/wait_for_ajax.rb | |
| parent | 1e8bf60f40426de9cc6671a42019237688a848ac (diff) | |
| parent | 374037b8a326b82a7787b2e29da820aa9c4390b3 (diff) | |
Merge remote-tracking branch 'origin/master' into 8-6-stable
Diffstat (limited to 'spec/support/wait_for_ajax.rb')
| -rw-r--r-- | spec/support/wait_for_ajax.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/support/wait_for_ajax.rb b/spec/support/wait_for_ajax.rb index 692d219e9f1..b90fc112671 100644 --- a/spec/support/wait_for_ajax.rb +++ b/spec/support/wait_for_ajax.rb @@ -1,6 +1,6 @@ module WaitForAjax def wait_for_ajax - Timeout.timeout(Capybara.default_wait_time) do + Timeout.timeout(Capybara.default_max_wait_time) do loop until finished_all_ajax_requests? end end |