diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-03-30 15:08:14 +0200 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-03-31 11:43:17 +0200 |
| commit | e559283cc0fe3f05ee57e060c44e307e8f721b67 (patch) | |
| tree | b95ba5ffb025807e176bbf99567b2106a46a9724 | |
| parent | acc2a03d924ec0b8fde8231e258830c103dffc59 (diff) | |
| download | gitlab-ce-e559283cc0fe3f05ee57e060c44e307e8f721b67.tar.gz | |
Increase Capybara's timeout
Also disabled assets warming for Capybara/RSpec and remove a check to
skip assets warming when ./tmp/cache/assets/test exists because assets
are now served by webpack-dev-server.
Signed-off-by: Rémy Coutable <remy@rymai.me>
| -rw-r--r-- | features/support/capybara.rb | 2 | ||||
| -rw-r--r-- | spec/support/capybara.rb | 4 | ||||
| -rw-r--r-- | spec/support/test_env.rb | 6 |
3 files changed, 3 insertions, 9 deletions
diff --git a/features/support/capybara.rb b/features/support/capybara.rb index c0c489d2775..456ec4deaf5 100644 --- a/features/support/capybara.rb +++ b/features/support/capybara.rb @@ -3,7 +3,7 @@ require 'capybara/poltergeist' require 'capybara-screenshot/spinach' # Give CI some extra time -timeout = (ENV['CI'] || ENV['CI_SERVER']) ? 30 : 10 +timeout = (ENV['CI'] || ENV['CI_SERVER']) ? 40 : 10 Capybara.javascript_driver = :poltergeist Capybara.register_driver :poltergeist do |app| diff --git a/spec/support/capybara.rb b/spec/support/capybara.rb index aa14709bc9c..cebc972be7e 100644 --- a/spec/support/capybara.rb +++ b/spec/support/capybara.rb @@ -4,7 +4,7 @@ require 'capybara/poltergeist' require 'capybara-screenshot/rspec' # Give CI some extra time -timeout = (ENV['CI'] || ENV['CI_SERVER']) ? 30 : 10 +timeout = (ENV['CI'] || ENV['CI_SERVER']) ? 40 : 10 Capybara.javascript_driver = :poltergeist Capybara.register_driver :poltergeist do |app| @@ -27,6 +27,6 @@ Capybara::Screenshot.prune_strategy = :keep_last_run RSpec.configure do |config| config.before(:suite) do - TestEnv.warm_asset_cache + TestEnv.warm_asset_cache unless ENV['CI'] || ENV['CI_SERVER'] end end diff --git a/spec/support/test_env.rb b/spec/support/test_env.rb index 78be23bd853..b63df38187c 100644 --- a/spec/support/test_env.rb +++ b/spec/support/test_env.rb @@ -170,17 +170,11 @@ module TestEnv # Otherwise they'd be created by the first test, often timing out and # causing a transient test failure def warm_asset_cache - return if warm_asset_cache? return unless defined?(Capybara) Capybara.current_session.driver.visit '/' end - def warm_asset_cache? - cache = Rails.root.join(*%w(tmp cache assets test)) - Dir.exist?(cache) && Dir.entries(cache).length > 2 - end - private def factory_repo_path |