lib/webmock/webmock.rb in webmock-1.4.0 vs lib/webmock/webmock.rb in webmock-1.5.0
- old
+ new
@@ -25,17 +25,19 @@
open(File.join(File.dirname(__FILE__), '../../VERSION')) { |f|
f.read.strip
}
end
- def self.allow_net_connect!
+ def self.allow_net_connect!(options = {})
Config.instance.allow_net_connect = true
+ Config.instance.net_http_connect_on_start = options[:net_http_connect_on_start]
end
def self.disable_net_connect!(options = {})
Config.instance.allow_net_connect = false
Config.instance.allow_localhost = options[:allow_localhost]
Config.instance.allow = options[:allow]
+ Config.instance.net_http_connect_on_start = options[:net_http_connect_on_start]
end
def self.net_connect_allowed?(uri = nil)
if uri.is_a?(String)
uri = WebMock::Util::URI.normalize_uri(uri)