summaryrefslogtreecommitdiff
path: root/features/support
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzegorz.bizon@ntsn.pl>2015-12-13 00:39:47 +0100
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2015-12-15 14:19:35 +0100
commit9470d05c70c15df75ae6be45812967abf89ae59a (patch)
tree1be0edd00d237885917b485d51cf7ce3df3cc550 /features/support
parent7c14541d2bb9735402086c951730344fa5203278 (diff)
downloadgitlab-ce-9470d05c70c15df75ae6be45812967abf89ae59a.tar.gz
Add spinach test for note polling
This also increases capybara timeout to 15 seconds (note polling interval). Capybara will look for new note for this period of time.
Diffstat (limited to 'features/support')
-rw-r--r--features/support/capybara.rb2
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|