webmock 1.24.5 → 1.24.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,11 +1,13 @@
1
1
  # Changelog
2
2
 
3
- ## 1.24.5
3
+ ## 1.24.6
4
4
 
5
5
  * Fixed issue with RUBY_VERSION comparison using old RubyGems.
6
6
 
7
7
  Thanks to [Chris Griego](https://github.com/cgriego).
8
8
 
9
+ * Support for http.rb >= 2.0.0
10
+
9
11
  ## 1.24.4
10
12
 
11
13
  * Fixed the issue with parsing query to a hash with nested array i.e. `a[][b][]=one&a[][c][]=two`
@@ -33,7 +33,7 @@ module HTTP
33
33
  def normalize_uri(uri)
34
34
  return unless uri
35
35
 
36
- uri = URI.parse uri
36
+ uri = Addressable::URI.parse uri
37
37
  uri.port = nil if uri.default_port && uri.port == uri.default_port
38
38
 
39
39
  uri
@@ -314,7 +314,7 @@ module WebMock
314
314
  #
315
315
  # So before this point, WebMock raises an ArgumentError if any of the headers are symbols
316
316
  # instead of the cryptic NoMethodError "undefined method `split' ...` from Net::HTTP
317
- if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.3.0')
317
+ if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.3.0')
318
318
  header_as_symbol = headers.keys.find {|header| header.is_a? Symbol}
319
319
  if header_as_symbol
320
320
  raise ArgumentError.new("Net:HTTP does not accept headers as symbols")
@@ -1,3 +1,3 @@
1
1
  module WebMock
2
- VERSION = '1.24.5' unless defined?(::WebMock::VERSION)
2
+ VERSION = '1.24.6' unless defined?(::WebMock::VERSION)
3
3
  end
@@ -239,9 +239,9 @@ shared_context "allowing and disabling net connect" do |*adapter_info|
239
239
  end
240
240
 
241
241
  it "should make a real request if request is allowed by path regexp and url contains default port", :net_connect => true do
242
- WebMock.disable_net_connect!(:allow => %r{github.com/bblimke/webmock})
242
+ WebMock.disable_net_connect!(:allow => %r{www.google.pl/webhp})
243
243
  method = http_library == :httpclient ? :head : :get
244
- expect(http_request(method, 'https://github.com:443/bblimke/webmock').status).to eq('200')
244
+ expect(http_request(method, 'https://www.google.pl:443/webhp').status).to eq('200')
245
245
  end
246
246
  end
247
247
  end
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: webmock
3
3
  version: !ruby/object:Gem::Version
4
- hash: 125
4
+ hash: 123
5
5
  prerelease:
6
6
  segments:
7
7
  - 1
8
8
  - 24
9
- - 5
10
- version: 1.24.5
9
+ - 6
10
+ version: 1.24.6
11
11
  platform: ruby
12
12
  authors:
13
13
  - Bartosz Blimke
@@ -15,7 +15,7 @@ autorequire:
15
15
  bindir: bin
16
16
  cert_chain: []
17
17
 
18
- date: 2016-04-21 00:00:00 +02:00
18
+ date: 2016-04-25 00:00:00 +02:00
19
19
  default_executable:
20
20
  dependencies:
21
21
  - !ruby/object:Gem::Dependency
OSZAR »