summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2016-10-21 01:03:16 -0700
committerStan Hu <stanhu@gmail.com>2016-10-21 01:09:41 -0700
commitcf31a0f0b2b5ba6d4445e3e5c767119f9cf5953a (patch)
tree73b19faca23ac271fbdc3523fe573c8f680fbad5
parentb7170277c65fb76b5d0d732ab598eb475b0d823c (diff)
downloadgitlab-ce-cf31a0f0b2b5ba6d4445e3e5c767119f9cf5953a.tar.gz
Disable warming of the asset cache in Spinach tests under CI
I suspect some combination of Knapsack tests cause no regular Rack tests to be loaded (i.e. all JavaScript tests), which leads to the error: ArgumentError: rack-test requires a rack application, but none was given In CI, we precompile all the assets so there is no need to warm the asset cache in any case. Closes #23613
-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 fe9e39cf509..dae0d0f918c 100644
--- a/features/support/capybara.rb
+++ b/features/support/capybara.rb
@@ -20,5 +20,5 @@ unless ENV['CI'] || ENV['CI_SERVER']
end
Spinach.hooks.before_run do
- TestEnv.warm_asset_cache
+ TestEnv.warm_asset_cache unless ENV['CI'] || ENV['CI_SERVER']
end