Skip to content

Commit 0af60fd

Browse files
committed
Version update to 1.12.0
1 parent 9f6d998 commit 0af60fd

File tree

3 files changed

+51
-1
lines changed

3 files changed

+51
-1
lines changed

CHANGELOG.md

+41
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,46 @@
11
# Changelog
22

3+
4+
## 1.12.0
5+
6+
* Not using Gem spec anymore to check loaded Curb version.
7+
8+
* `WebMock.disable_net_connect!` now accepts array of regexps as allow param:
9+
10+
i.e. `WebMock.disable_net_connect!(:allow => [/google.com/, /yahoo.com/])`
11+
12+
Thanks to [Bastien Vaucher](https://github.com/bastien)
13+
14+
* Fixed `on_header` Curb callback behaviour in Curb adapter
15+
16+
Thanks to [Joel Chippindale](https://github.com/mocoso)
17+
18+
* Fixed aws-sdk compatibility with Ruby 2.0, by supporting `continue_timeout` accessor on Net::HTTP socket.
19+
20+
Thanks to [Lin Jen-Shin](https://github.com/godfat)
21+
22+
* Fixed WebMock::Server to not give "log writing failed. can't be called from trap context" warning with Ruby 2.0
23+
24+
Thanks to [Murahashi Sanemat Kenichi](https://github.com/sanemat)
25+
26+
* Added support for EM-HTTP-Request streaming data off disk feature.
27+
28+
Thanks to [Lin Jen-Shin](https://github.com/godfat)
29+
30+
* Added compatibility with Minitest 5
31+
32+
Thanks to [Tim Kurvers](https://github.com/timkurvers)
33+
34+
* Excon >= 0.22 compatibility.
35+
36+
* README has nice sytnax hightlighting and fixed code styling!
37+
38+
Thanks to [Ilya Vassilevsky](https://github.com/vassilevsky)
39+
40+
* Compatibility with Rails 4 `rack.session.options`
41+
42+
Thanks to [gotwalt](https://github.com/gotwalt)
43+
344
## 1.11.0
445

546
* Excon >= 0.17 support.

README.md

+9
Original file line numberDiff line numberDiff line change
@@ -430,6 +430,8 @@ RestClient.get('www.example.org:8080', '/') # ===> Allowed
430430

431431
WebMock.disable_net_connect!(:allow => /ample.org/)
432432

433+
WebMock.disable_net_connect!(:allow => [/ample.org/, /googl/])
434+
433435
RestClient.get('www.example.org', '/') # ===> Allowed
434436
```
435437

@@ -838,6 +840,13 @@ People who submitted patches and new features or suggested improvements. Many th
838840
* Mokevnin Kirill
839841
* Alex Grant
840842
* Lucas Dohmen
843+
* Bastien Vaucher
844+
* Joost Baaij
845+
* Joel Chippindale
846+
* Murahashi Sanemat Kenichi
847+
* Tim Kurvers
848+
* Ilya Vassilevsky
849+
* gotwalt
841850

842851
For a full list of contributors you can visit the
843852
[contributors](https://github.com/bblimke/webmock/contributors) page.

lib/webmock/version.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
module WebMock
2-
VERSION = '1.11.0' unless defined?(::WebMock::VERSION)
2+
VERSION = '1.12.0' unless defined?(::WebMock::VERSION)
33
end

0 commit comments

Comments
 (0)