diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-07-14 09:03:03 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-07-14 09:03:03 +0000 |
| commit | 87e6786aa013c976f3c0ceea7653f66187dc5c90 (patch) | |
| tree | c6ca56e5008a714e90a9ec91703eab19022352ff | |
| parent | 90e47dd949abdff410d20db2ed908494a5248cf4 (diff) | |
| parent | ce02bf9900eae0f15d7ff94755960f4440d5a3e5 (diff) | |
| download | gitlab-ce-87e6786aa013c976f3c0ceea7653f66187dc5c90.tar.gz | |
Merge branch 'rs-fix-coverage' into 'master'
Move coverage-related setup back to spec_helper
These tools must be loaded before our regular Rails environment.
Partially reverts 57830201a9152b56ccf65a98275601617f44653d
See merge request !976
| -rw-r--r-- | spec/spec_helper.rb | 11 | ||||
| -rw-r--r-- | spec/support/coverage.rb | 8 |
2 files changed, 11 insertions, 8 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 682a8863bad..d0f1873ee2d 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,4 +1,15 @@ +if ENV['SIMPLECOV'] + require 'simplecov' + SimpleCov.start :rails +end + +if ENV['COVERALLS'] + require 'coveralls' + Coveralls.wear_merged! +end + ENV["RAILS_ENV"] ||= 'test' + require File.expand_path("../../config/environment", __FILE__) require 'rspec/rails' require 'shoulda/matchers' diff --git a/spec/support/coverage.rb b/spec/support/coverage.rb deleted file mode 100644 index a54bf03380c..00000000000 --- a/spec/support/coverage.rb +++ /dev/null @@ -1,8 +0,0 @@ -if ENV['SIMPLECOV'] - require 'simplecov' -end - -if ENV['COVERALLS'] - require 'coveralls' - Coveralls.wear_merged! -end |