diff options
-rw-r--r-- | features/support/env.rb | 10 | ||||
-rw-r--r-- | spec/spec_helper.rb | 14 |
2 files changed, 12 insertions, 12 deletions
diff --git a/features/support/env.rb b/features/support/env.rb index bb4249efe20..4b76faab564 100644 --- a/features/support/env.rb +++ b/features/support/env.rb @@ -1,20 +1,20 @@ -require 'simplecov' unless ENV['CI'] +if ENV['SIMPLECOV'] + require 'simplecov' +end -if ENV['TRAVIS'] +if ENV['COVERALLS'] require 'coveralls' - Coveralls.wear_merged! + Coveralls.wear_merged!('rails') end ENV['RAILS_ENV'] = 'test' require './config/environment' - require 'rspec' require 'rspec/expectations' require 'database_cleaner' require 'spinach/capybara' require 'sidekiq/testing/inline' - %w(select2_helper test_env repo_helpers).each do |f| require Rails.root.join('spec', 'support', f) end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 81e92a5913a..60322b67a79 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,14 +1,14 @@ -# This file is copied to spec/ when you run 'rails generate rspec:install' -ENV["RAILS_ENV"] ||= 'test' -require File.expand_path("../../config/environment", __FILE__) - -require 'simplecov' unless ENV['CI'] +if ENV['SIMPLECOV'] + require 'simplecov' +end -if ENV['TRAVIS'] +if ENV['COVERALLS'] require 'coveralls' - Coveralls.wear_merged! + Coveralls.wear_merged!('rails') end +ENV["RAILS_ENV"] ||= 'test' +require File.expand_path("../../config/environment", __FILE__) require 'rspec/rails' require 'capybara/rails' require 'capybara/rspec' |