diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-07-14 11:07:07 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-07-14 11:07:07 +0200 |
| commit | c013a9de148c7a4557c0ae80449ba4c7fbf2746b (patch) | |
| tree | 2671ddfec2b16a16a793555217f9f228be43a4d4 | |
| parent | 6114aedfe5bb87f6746b00a6c82af67019378ec4 (diff) | |
| parent | 87e6786aa013c976f3c0ceea7653f66187dc5c90 (diff) | |
| download | gitlab-ce-c013a9de148c7a4557c0ae80449ba4c7fbf2746b.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
| -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 |