Comparing changes
Open a pull request
base repository: bblimke/webmock
base: v3.3.0
head repository: bblimke/webmock
compare: v3.4.1
- 18 commits
- 17 files changed
- 7 contributors
Commits on Jan 26, 2018
-
-
Merge pull request #741 from oliakremmyda/change_username
Change git username
Commits on Mar 2, 2018
-
Fix: Suggested stub body to_return should be valid JSON when request …
…header contains 'Accept'=>'application/json'. It now suggests a return body with '{}'. (#691) * Fix: Suggested stub body to_return should be valid JSON when request header contains 'Accept'=>'application/json'. It now suggests a return body with '{}'.
-
Commits on Mar 8, 2018
-
-
Merge pull request #747 from oliakremmyda/curl_reset
Add `reset` method in curb adapter
Commits on Mar 15, 2018
-
Prevent
Net/ReadTimeout
error in Ruby 2.6This PR fixes the following build error in Ruby 2.6.0 (ruby-head). ```console $ ruby --version ruby 2.6.0dev (2018-03-07 trunk 62693) [x86_64-linux] % bundle exec rake (snip) 1) Net:HTTP with WebMock when net connect is allowed should make a real https request if request is not stubbed Failure/Error: response = super(request, nil, &nil) Net::ReadTimeout: Net::ReadTimeout Shared Example Group: "allowing and disabling net connect" called from ./spec/acceptance/webmock_shared.rb:25 Shared Example Group: "with WebMock" called from ./spec/acceptance/net_http/net_http_spec.rb:10 # ./lib/webmock/http_lib_adapters/net_http.rb:97:in `block in request' # ./lib/webmock/http_lib_adapters/net_http.rb:105:in `block in request' # ./lib/webmock/http_lib_adapters/net_http.rb:137:in `start_with_connect_without_finish' # ./lib/webmock/http_lib_adapters/net_http.rb:104:in `request' # ./spec/acceptance/net_http/net_http_spec_helper.rb:35:in `block in http_request' # ./lib/webmock/http_lib_adapters/net_http.rb:123:in `start_without_connect' # ./lib/webmock/http_lib_adapters/net_http.rb:150:in `start' # ./spec/acceptance/net_http/net_http_spec_helper.rb:34:in `http_request' # ./spec/acceptance/shared/allowing_and_disabling_net_connect.rb:14:in `block (4 levels) in <top (required)>' # ------------------ # --- Caused by: --- # Net::ReadTimeout: # Net::ReadTimeout # ./lib/webmock/http_lib_adapters/net_http.rb:97:in `block in request' (Errors continue after this) ``` https://travis-ci.org/bblimke/webmock/jobs/350668167#L942-L1202 This is because it was changed to use `IO#read_nonblock` based on the value of `@rbuf` by the following commit. ruby/ruby@b02fc0f This PR forces the 2nd argument `tmp` of `IO#read_nonblock` to `nil` by using `TracePoint`. So this prevents `Net::ReadTimeout` from occurring.
Commits on Apr 5, 2018
-
Fix redundant
Util::
namespacingOn line 5 the reference to `Util` resolves to the class that was just opened on line 4, so `Util::` is redundant.
Commits on Apr 6, 2018
-
Merge pull request #754 from EiNSTeiN-/patch-1
Fix redundant `Util::` namespacing
Commits on Apr 29, 2018
-
Merge pull request #751 from koic/prevent_net_readtimeout_error_in_ru…
…by_2_6 Prevent `Net/ReadTimeout` error in Ruby 2.6
-
Handling query params, which represent nested hashes with keys starti…
…ng with non word characters.
-
-
Allowing requests with url encoded body to be matched by stubs declar…
…ed with hash body with non-string values.
Commits on Apr 30, 2018
Commits on May 1, 2018
-
Merge pull request #756 from luk4s/755_hash_incliding_in_body
do not convert HashIncludingMatcher to_s
-
This comparison is taking too long to generate.
Unfortunately it looks like we can’t render this comparison for you right now. It might be too big, or there might be something weird with your repository.
You can try running this command locally to see the comparison on your machine:
git diff v3.3.0...v3.4.1