':allow_localhost => true' now permits 127.0.0.1 as well as 'localhost'

bblimke · May 13, 2010 · 3c92a45 · 3c92a45
1 parent 7c4a298
commit 3c92a45
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/lib/webmock/webmock.rb b/lib/webmock/webmock.rb
@@ -44,7 +44,7 @@ def net_connect_allowed?(uri = nil)
       uri = WebMock::Util::URI.normalize_uri(uri)
     end
     Config.instance.allow_net_connect || 
-      (Config.instance.allow_localhost && uri.is_a?(Addressable::URI) && uri.host == 'localhost')
+      (Config.instance.allow_localhost && uri.is_a?(Addressable::URI) && (uri.host == 'localhost' || uri.host == '127.0.0.1'))
   end
 
   def registered_request?(request_signature)

diff --git a/spec/webmock_spec.rb b/spec/webmock_spec.rb
@@ -84,11 +84,17 @@ class MyException < StandardError; end;
         }.should raise_error(WebMock::NetConnectNotAllowedError, client_specific_request_string("Real HTTP connections are disabled. Unregistered request: GET http://www.example.com/"))
       end
 
-      it "should allow a real request localhost" do
+      it "should allow a real request to localhost" do
         lambda {
           http_request(:get, "http://localhost:12345/")
         }.should raise_error(connection_refused_exception_class)
       end
+
+      it "should allow a real request to 127.0.0.1" do
+        lambda {
+          http_request(:get, "http://127.0.0.1:12345/")
+        }.should raise_error(connection_refused_exception_class)
+      end
     end
   end