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 17:44:08 +0200 |
| commit | 019709f8100a5e4fb7b356fb57b4d9ea29f8c4bc (patch) | |
| tree | f40de023c1e63b9765ad681a6ca900b06b7b944c | |
| parent | 913af87515236904ba1cec7a02c5c0ccf7925da2 (diff) | |
| download | gitlab-ce-019709f8100a5e4fb7b356fb57b4d9ea29f8c4bc.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 |