Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-07-11 12:11:44 +0300
committerRémy Coutable <remy@rymai.me>2017-07-11 12:11:44 +0300
commit6291bc8c641ececb703483b624c8adf4163601c4 (patch)
tree22b800fbe5dc8a30d281078bbdd6f6bd2e155d76 /spec
parent25d241ae97e22159bf71caa5553eb192fdb6d4c0 (diff)
parent4144352aae9a13b6efe1424aa4f7422b30163201 (diff)
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
Diffstat (limited to 'spec')
-rw-r--r--spec/support/test_env.rb1
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..."