diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-10-21 09:41:23 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-10-21 09:41:23 +0000 |
| commit | e647af363706d181557e7652cacc19cd7c54dd59 (patch) | |
| tree | 83896fa7f88c00ed2858480fdcfdb25bd3aaea4e | |
| parent | cf837df9c0287427ad9380c3aed6d56ec3e6245a (diff) | |
| parent | cf31a0f0b2b5ba6d4445e3e5c767119f9cf5953a (diff) | |
| download | gitlab-ce-e647af363706d181557e7652cacc19cd7c54dd59.tar.gz | |
Merge branch 'sh-disable-warm-asset-cache-ci' into 'master'
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
See merge request !7033
| -rw-r--r-- | features/support/capybara.rb | 2 |
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 |