From 57830201a9152b56ccf65a98275601617f44653d Mon Sep 17 00:00:00 2001 From: Robert Speicher Date: Thu, 21 May 2015 18:24:46 -0400 Subject: Add spec/support files for WebMock and test coverage --- spec/spec_helper.rb | 12 ------------ spec/support/coverage.rb | 8 ++++++++ spec/support/webmock.rb | 4 ++++ 3 files changed, 12 insertions(+), 12 deletions(-) create mode 100644 spec/support/coverage.rb create mode 100644 spec/support/webmock.rb diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 8fe51cf4add..8cd00bdb2f9 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,16 +1,6 @@ -if ENV['SIMPLECOV'] - require 'simplecov' -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 'webmock/rspec' require 'email_spec' require 'sidekiq/testing/inline' @@ -18,8 +8,6 @@ require 'sidekiq/testing/inline' # in spec/support/ and its subdirectories. Dir[Rails.root.join("spec/support/**/*.rb")].each { |f| require f } -WebMock.disable_net_connect!(allow_localhost: true) - RSpec.configure do |config| config.use_transactional_fixtures = false config.use_instantiated_fixtures = false diff --git a/spec/support/coverage.rb b/spec/support/coverage.rb new file mode 100644 index 00000000000..a54bf03380c --- /dev/null +++ b/spec/support/coverage.rb @@ -0,0 +1,8 @@ +if ENV['SIMPLECOV'] + require 'simplecov' +end + +if ENV['COVERALLS'] + require 'coveralls' + Coveralls.wear_merged! +end diff --git a/spec/support/webmock.rb b/spec/support/webmock.rb new file mode 100644 index 00000000000..af2906b7568 --- /dev/null +++ b/spec/support/webmock.rb @@ -0,0 +1,4 @@ +require 'webmock' +require 'webmock/rspec' + +WebMock.disable_net_connect!(allow_localhost: true) -- cgit v1.2.3