Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce

c013a9de · Dmitriy Zaporozhets · 6114aedf · 87e6786a · c013a9de · 6114aedf
Commit c013a9de authored Jul 14, 2015 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 8 deletions

spec/spec_helper.rb spec/spec_helper.rb +11 -0

spec/support/coverage.rb spec/support/coverage.rb +0 -8

No files found.
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
+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'

--- a/spec/support/coverage.rb
+++ b/spec/support/coverage.rb
-if ENV['SIMPLECOV']
-  require 'simplecov'
-end
-
-if ENV['COVERALLS']
-  require 'coveralls'
-  Coveralls.wear_merged!
-end