summaryrefslogtreecommitdiff
path: root/spec/spec_helper.rb
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2015-05-21 18:24:46 -0400
committerRobert Speicher <rspeicher@gmail.com>2015-06-10 01:31:27 -0400
commit57830201a9152b56ccf65a98275601617f44653d (patch)
treeae5698bb851d8e203acedadbdd0ebec20742807c /spec/spec_helper.rb
parent2f3ab0ab858f3343807716d5ef033f7a90112d51 (diff)
downloadgitlab-ce-57830201a9152b56ccf65a98275601617f44653d.tar.gz
Add spec/support files for WebMock and test coverage
Diffstat (limited to 'spec/spec_helper.rb')
-rw-r--r--spec/spec_helper.rb12
1 files changed, 0 insertions, 12 deletions
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