diff options
author | Robert Speicher <robert@gitlab.com> | 2016-07-27 16:42:07 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2016-07-27 16:42:07 +0000 |
commit | 37306971903ec06e7e3b12dbad598e6555c2b2c1 (patch) | |
tree | 5869254558516e8118ce0f4e105f3dc457af09a3 /spec/spec_helper.rb | |
parent | ac7f3e6a9201778e796394d54f86f45f7d789dc9 (diff) | |
parent | f00dc0fcae6cf482c1bf60065bd2c1ecfaa9748d (diff) | |
download | gitlab-ce-37306971903ec06e7e3b12dbad598e6555c2b2c1.tar.gz |
Merge branch 'simple-cov' into 'master'
Generate coverage report from whole test suite
Extends our CI plan to merge all coverage results and generate HTML report.
See merge request !5018
Diffstat (limited to 'spec/spec_helper.rb')
-rw-r--r-- | spec/spec_helper.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 3638dcbb2d3..4f3aacf55be 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,7 +1,5 @@ -if ENV['SIMPLECOV'] - require 'simplecov' - SimpleCov.start :rails -end +require './spec/simplecov_env' +SimpleCovEnv.start! ENV["RAILS_ENV"] ||= 'test' |