diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2015-12-15 14:02:28 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2015-12-15 14:02:28 +0000 |
| commit | 4493d3fd556af6ded47f940f258b0fc26c9eb3e8 (patch) | |
| tree | 3879f17a3a175e13d7ebaf33dc2b06a1e6ad4f6b /features/support | |
| parent | 9451db3819ae45734c4343e55a74d347cdacf70d (diff) | |
| parent | 8fe821cfa5acea2a4ab1fce7f35a76455d5a1cac (diff) | |
| download | gitlab-ce-4493d3fd556af6ded47f940f258b0fc26c9eb3e8.tar.gz | |
Merge branch 'tests/note-polling' into 'master'
Add feature specs for note polling
Ref. #4032, !2084
cc @rspeicher
See merge request !2086
Diffstat (limited to 'features/support')
| -rw-r--r-- | features/support/capybara.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/features/support/capybara.rb b/features/support/capybara.rb index 31dbf0feb2f..4156c7ec484 100644 --- a/features/support/capybara.rb +++ b/features/support/capybara.rb @@ -2,7 +2,7 @@ require 'spinach/capybara' require 'capybara/poltergeist' # Give CI some extra time -timeout = (ENV['CI'] || ENV['CI_SERVER']) ? 90 : 10 +timeout = (ENV['CI'] || ENV['CI_SERVER']) ? 90 : 15 Capybara.javascript_driver = :poltergeist Capybara.register_driver :poltergeist do |app| |