From f659c406ab90b6ce45138fec5e7756c7740f8e2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Coutable?= Date: Thu, 30 Mar 2017 16:30:05 +0200 Subject: Eager-load the Capybara server to prevent timeouts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Rémy Coutable --- spec/support/capybara.rb | 2 +- spec/support/test_env.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'spec') diff --git a/spec/support/capybara.rb b/spec/support/capybara.rb index cebc972be7e..d4e38eb2a51 100644 --- a/spec/support/capybara.rb +++ b/spec/support/capybara.rb @@ -27,6 +27,6 @@ Capybara::Screenshot.prune_strategy = :keep_last_run RSpec.configure do |config| config.before(:suite) do - TestEnv.warm_asset_cache unless ENV['CI'] || ENV['CI_SERVER'] + TestEnv.eager_load_driver_server end end diff --git a/spec/support/test_env.rb b/spec/support/test_env.rb index b63df38187c..6c48be904fc 100644 --- a/spec/support/test_env.rb +++ b/spec/support/test_env.rb @@ -169,7 +169,7 @@ module TestEnv # # Otherwise they'd be created by the first test, often timing out and # causing a transient test failure - def warm_asset_cache + def eager_load_driver_server return unless defined?(Capybara) Capybara.current_session.driver.visit '/' -- cgit v1.2.1