lib/webmock/webmock.rb in webmock-1.8.5 vs lib/webmock/webmock.rb in webmock-1.8.6

- old
+ new

@@ -55,16 +55,24 @@ def self.net_connect_allowed?(uri = nil) if uri.is_a?(String) uri = WebMock::Util::URI.normalize_uri(uri) end + Config.instance.allow_net_connect || - (Config.instance.allow_localhost && WebMock::Util::URI.is_uri_localhost?(uri)) || - Config.instance.allow && ( - (Config.instance.allow.kind_of?(Regexp) && uri.to_s =~ Config.instance.allow) || - (Config.instance.allow.respond_to?(:include?) && - Config.instance.allow.include?(uri.host) || Config.instance.allow.include?("#{uri.host}:#{uri.port}"))) + ( + Config.instance.allow_localhost && WebMock::Util::URI.is_uri_localhost?(uri)) || + Config.instance.allow && ( + (Config.instance.allow.kind_of?(Regexp) && uri.to_s =~ Config.instance.allow) || + ( + Config.instance.allow.respond_to?(:include?) && + ( + Config.instance.allow.include?(uri.host) || + Config.instance.allow.include?("#{uri.host}:#{uri.port}") + ) + ) + ) end def self.reset! WebMock::RequestRegistry.instance.reset! WebMock::StubRegistry.instance.reset! @@ -103,13 +111,13 @@ reset_callbacks after_request registered_request? ).each do |method| self.class_eval(%Q( - def #{method}(*args, &block) - WebMock::Deprecation.warning("WebMock##{method} instance method is deprecated. Please use WebMock.#{method} class method instead") - WebMock.#{method}(*args, &block) - end + def #{method}(*args, &block) + WebMock::Deprecation.warning("WebMock##{method} instance method is deprecated. Please use WebMock.#{method} class method instead") + WebMock.#{method}(*args, &block) + end )) end self.enable! end