From 49557000839599af989bc37b46aa5868b6d72ab0 Mon Sep 17 00:00:00 2001
From: Arthur Neves <arthurnn@gmail.com>
Date: Wed, 31 Dec 2014 21:53:46 -0500
Subject: [PATCH] Remove webmock

---
 Gemfile             | 1 -
 Gemfile.lock        | 7 -------
 spec/spec_helper.rb | 6 ------
 3 files changed, 0 insertions(+), 14 deletions(-)

diff --git a/Gemfile b/Gemfile
index d999aa1..797af06 100644
--- a/Gemfile
+++ b/Gemfile
@@ -54,7 +54,6 @@ gem 'ri_cal'
 gem 'yajl-ruby', :require => "yajl"
 
 group :development, :test do
-  gem 'webmock', :require => false
   gem 'airbrake', :require => false
   gem 'pry-rails'
 #  gem 'rpm_contrib'
diff --git a/Gemfile.lock b/Gemfile.lock
index 1b27229..86419c9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -86,8 +86,6 @@ GEM
       simplecov (>= 0.7)
       term-ansicolor
       thor
-    crack (0.4.2)
-      safe_yaml (~> 1.0.0)
     css_parser (1.3.5)
       addressable
     database_cleaner (1.2.0)
@@ -281,7 +279,6 @@ GEM
     rushover (0.3.0)
       json
       rest-client
-    safe_yaml (1.0.4)
     sass (3.4.9)
     sass-rails (5.0.1)
       railties (>= 4.0.0, < 5.0)
@@ -325,9 +322,6 @@ GEM
     useragent (0.9.0)
     warden (1.2.3)
       rack (>= 1.0)
-    webmock (1.15.0)
-      addressable (>= 2.2.7)
-      crack (>= 0.3.2)
     websocket-driver (0.3.3)
     xmpp4r (0.5.5)
     xpath (2.0.0)
@@ -392,6 +386,5 @@ DEPENDENCIES
   underscore-rails
   unicorn
   useragent
-  webmock
   xmpp4r
   yajl-ruby
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 83a043b..648eb8d 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -21,7 +21,6 @@ require File.expand_path("../../config/environment", __FILE__)
 require 'rspec/rails'
 require 'email_spec'
 require 'database_cleaner'
-require 'webmock/rspec'
 require 'xmpp4r'
 require 'xmpp4r/muc'
 require 'mongoid-rspec'
@@ -47,17 +46,12 @@ RSpec.configure do |config|
     DatabaseCleaner[:mongoid].strategy = :truncation
     DatabaseCleaner.clean
   end
-  config.include WebMock::API
 
   config.include Haml, :type => :helper
   config.include Haml::Helpers, :type => :helper
   config.before(:each, :type => :helper) do |config|
     init_haml_helpers
   end
-
-  config.before(:all) do
-    WebMock.disable_net_connect! :allow => /coveralls\.io|127\.0\.0\.1/
-  end
 end
 
 OmniAuth.config.test_mode = true
--
libgit2 0.21.2