summaryrefslogtreecommitdiff
path: root/features
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-07-27 16:42:07 +0000
committerRobert Speicher <robert@gitlab.com>2016-07-27 16:42:07 +0000
commit37306971903ec06e7e3b12dbad598e6555c2b2c1 (patch)
tree5869254558516e8118ce0f4e105f3dc457af09a3 /features
parentac7f3e6a9201778e796394d54f86f45f7d789dc9 (diff)
parentf00dc0fcae6cf482c1bf60065bd2c1ecfaa9748d (diff)
downloadgitlab-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 'features')
-rw-r--r--features/support/env.rb5
1 files changed, 2 insertions, 3 deletions
diff --git a/features/support/env.rb b/features/support/env.rb
index f0a3dd8d2d0..569fd444e86 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -1,6 +1,5 @@
-if ENV['SIMPLECOV']
- require 'simplecov'
-end
+require './spec/simplecov_env'
+SimpleCovEnv.start!
ENV['RAILS_ENV'] = 'test'
require './config/environment'