diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-07-11 09:11:44 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-07-11 09:11:44 +0000 |
| commit | 6291bc8c641ececb703483b624c8adf4163601c4 (patch) | |
| tree | 22b800fbe5dc8a30d281078bbdd6f6bd2e155d76 | |
| parent | 25d241ae97e22159bf71caa5553eb192fdb6d4c0 (diff) | |
| parent | 4144352aae9a13b6efe1424aa4f7422b30163201 (diff) | |
| download | gitlab-ce-6291bc8c641ececb703483b624c8adf4163601c4.tar.gz | |
Merge branch 'rs-warm-capybara-only-in-ci' into 'master'
Don't attempt to warm the Capybara cache outside of CI
See merge request !12761
| -rw-r--r-- | spec/support/test_env.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/support/test_env.rb b/spec/support/test_env.rb index 0cae5620920..0a194ca4c90 100644 --- a/spec/support/test_env.rb +++ b/spec/support/test_env.rb @@ -206,6 +206,7 @@ module TestEnv # Otherwise they'd be created by the first test, often timing out and # causing a transient test failure def eager_load_driver_server + return unless ENV['CI'] return unless defined?(Capybara) puts "Starting the Capybara driver server..." |