From 50efd27710343293afb2d803ca07135820492680 Mon Sep 17 00:00:00 2001
From: Sarah Mei <sarahmei@gmail.com>
Date: Sun, 31 Oct 2010 20:04:24 -0700
Subject: [PATCH] Removing webmock from cucumber - interferes with capybara
 (more investigation needed).

---
 Gemfile                 | 2 +-
 features/support/env.rb | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 70a944119..4e8b65d55 100644
--- a/Gemfile
+++ b/Gemfile
@@ -60,7 +60,7 @@ group :test do
   gem 'rspec-rails', '>= 2.0.0'
   gem 'mocha'
   gem 'database_cleaner', '0.5.2'
-  gem 'webmock'
+  gem 'webmock', :require => false
   gem 'jasmine', :path => 'vendor/gems/jasmine', :require => false
   gem 'mongrel', :require => false if RUBY_VERSION.include? "1.8"
 end
diff --git a/features/support/env.rb b/features/support/env.rb
index 2fb86c4dc..f196e1776 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -22,8 +22,6 @@ require 'cucumber/rails/capybara_javascript_emulation' # Lets you click links wi
 # steps to use the XPath syntax.
 Capybara.default_selector = :css
 
-WebMock.disable_net_connect!(:allow_localhost => true)
-
 # If you set this to false, any error raised from within your app will bubble
 # up to your step definition and out to cucumber unless you catch it somewhere
 # on the way. You can make Rails rescue errors and render error pages on a