summaryrefslogtreecommitdiff
path: root/spec/spec_helper.rb
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2016-06-30 15:44:29 +0200
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2016-07-21 12:44:24 +0200
commit647da42af99a703fc3af3452b39acf0c3dc3050d (patch)
tree72f2b964b4a6e486cc63e23bd56ca676fbd7dc0f /spec/spec_helper.rb
parentef30678f1bab04b0f07a60e57966e3eed17c6842 (diff)
downloadgitlab-ce-647da42af99a703fc3af3452b39acf0c3dc3050d.tar.gz
Merge coverage report
Diffstat (limited to 'spec/spec_helper.rb')
-rw-r--r--spec/spec_helper.rb10
1 files changed, 9 insertions, 1 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 3638dcbb2d3..644f767402c 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,6 +1,14 @@
if ENV['SIMPLECOV']
require 'simplecov'
- SimpleCov.start :rails
+ require 'simplecov-rcov'
+
+ SimpleCov.start :rails do
+ if ENV['CI_BUILD_NAME']
+ coverage_dir "coverage/#{ENV['CI_BUILD_NAME']}"
+ command_name ENV['CI_BUILD_NAME']
+ merge_timeout 7200
+ end
+ end
end
ENV["RAILS_ENV"] ||= 'test'