Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: bblimke/webmock
base: 1ee340ffa6
...
head fork: bblimke/webmock
compare: master
This comparison is big! We’re only showing the most recent 250 commits
Commits on Jun 27, 2013
@takkanm takkanm fix query parametter with can't dup Object
fix TypeError when query value is can't dup Object(etc Symbol, Fixnum).
68b1576
@bblimke Merge pull request #291 from takkanm/accept_cant_dup_object_in_value
fix query parametter with can't dup Object
0f055dd
@bblimke Fixed issue with request.path when Addressable::URI is passed to #req…
…uest instead of URI with Ruby 2.0.
7383a81
@bblimke Improved test name. 3f0385d
@bblimke Version bump to 1.12.2 689eed3
waffleio Add waffle.io badge to readme a2702fe
@bblimke Merge pull request #292 from waffleio/patch-2
Add waffle.io badge to readme
b614bfa
Commits on Jun 28, 2013
@bblimke Don't run tests for em-http-request anymore on Travis. Does anyone st…
…ill use em-http-request 0.3?
55219f9
@bblimke Use #request_uri instead of #path to get path with query params from …
…Net::HTTP request.
b70d13d
@bblimke Ensured httpclient multipart requests don't blow up. 6941ff5
@bblimke Version 1.12.3 9f5dc19
@bblimke Fixed spec syntax to be compatible with Ruby 1.8 50ad719
Commits on Jul 05, 2013
@bblimke Ensured WebMock doesn't disconnect a previously started Net::HTTP con…
…nection upon request. This fixed Net::HTTP::Persistent compatibility.
3a9c994
@bblimke Version 1.13.0 d1e3ed8
Commits on Aug 04, 2013
@tomykaira tomykaira Fix wrong markup in README 238db47
Commits on Aug 05, 2013
@bblimke Merge pull request #299 from tomykaira/fix_markup
Fix wrong markup in README
be0df72
Commits on Aug 14, 2013
@s0meone s0meone changed NetConnectNotAllowedError's parent from StandardError to Exce…
…ption
fc03c89
Commits on Aug 15, 2013
@montague montague fix deprecation messages 088ed6a
@montague montague fix parsing error then a hash is included in a nested array 662381b
Commits on Aug 16, 2013
tbeauvais Change httpclient adapter to use thread local variables for thread sa…
…fety
dce4715
Commits on Aug 17, 2013
@bblimke Merge pull request #300 from tbeauvais/httpclient_thread_safe
Change httpclient adapter to use thread local variables for thread safety
04d5fe1
@bblimke Merge pull request #301 from zilverline/master
Change NetConnectNotAllowedError to inherit from Exception
d591341
@bblimke Changed specs to use httpstat.us for real requests. ff2df2a
Commits on Aug 21, 2013
@bblimke Revert "Merge pull request #300 from tbeauvais/httpclient_thread_safe"
This reverts commit 04d5fe1, reversing
changes made to be0df72.
20d49b0
@bblimke Merge pull request #303 from careport/careport-fix-query-to-values
Fix query to values parsing error
b5cc5c9
Commits on Sep 04, 2013
Ian Lesperance and Matthew Horan Trigger error callbacks asynchronously
This allows one to, e.g., yield the current fiber after making the
request and resume it in a callback.
41294b2
Ian Lesperance and Matthew Horan Ensure uppercase request method for Curb
Curb's `http` method takes its argument and sets it as the value for
libcurl's `CURLOPT_CUSTOMREQUEST`. Apparently this *needs* to be
uppercase.
750ae5d
Commits on Sep 06, 2013
@bblimke Merge pull request #305 from elliterate/async_error_callbacks
Trigger error callbacks asynchronously
aea9e9d
@bblimke Merge pull request #306 from elliterate/fix_curb_tests
Ensure uppercase request method for Curb
491bae3
Commits on Sep 24, 2013
@bblimke Don't remove request_block from params passed to excon. d549db7
Commits on Sep 26, 2013
@bblimke Ensured stubbing requests with non utf-8 query params works (at least…
… in some cases)
b9b4f36
Commits on Sep 27, 2013
@bblimke Fixed additional cases to accept uris with non-utf-8 7525777
Commits on Oct 03, 2013
@bblimke Removed waffle.io. 9767076
@bblimke Version bump to 1.14.0 b29c409
Commits on Oct 08, 2013
@manuelmeurer manuelmeurer Use `stub_request` consistently in README 115640e
@bblimke Merge pull request #312 from krautcomputing/readme_fix
Use stub_request consistently in README
327b2df
Commits on Oct 14, 2013
Brian D. Burns scrub invalid request params for Excon >= 0.27.5 9d87a2c
Commits on Oct 15, 2013
@bblimke Merge pull request #313 from burns/excon_params
scrub invalid request params for Excon
3b9efc0
@bblimke No need for Guard. c729e5f
@bblimke Version bump to 1.15.0 8e07a60
Commits on Oct 24, 2013
@tjsousa tjsousa Keep query values data type when sorting
Query values can be an array when the :flat_array notation option is used on the query mapper, so this conversion to hash is removing repeated query params (which can exist).

This is a fix for bblimke/webmock#227
2bf5f5c
@tjsousa tjsousa Create global WebMock configuration for query values notation f158a3c
@misfo misfo Failing unit test demonstrating WebMock ignoring params
For params specified multiple times all but the last value is ignored.

Issue #227
9d78134
@tjsousa tjsousa Change hash notation style to be compatible across Ruby versions 4cdd1c1
@tjsousa tjsousa Use default option when nil is passed along as parameter c0a4ec8
@tjsousa tjsousa Add unit tests to URI util methods spec 6c4e0dc
@tjsousa tjsousa Add acceptance test for repeated parameters scenario a36cc74
@tjsousa tjsousa Adapt spec to validate repeated params on optional flat array notation b28202d
@tjsousa tjsousa Add context of flat array notation to repeated params acceptance test 668d060
@tjsousa tjsousa Use flat array notation in the inverse query from values generation 57a6ba1
@tjsousa tjsousa Do not change query values notation config in allow/disable net connect f8035b2
@tjsousa tjsousa Remove unneeded debug message 6d5a11c
@tjsousa tjsousa Fix hash notation for Ruby 1.8.3 compatibility 870464e
Commits on Oct 27, 2013
@tamird tamird Fix rspec deprecation warnings 1dc0989
Commits on Oct 28, 2013
@tamird tamird Use rspec's `hash_including` if available 77baecd
Commits on Oct 29, 2013
@bblimke Merge pull request #320 from tamird/fix-hash_including
Fix hash_including for rspec 1
9ec2fb1
@bblimke Version bump to 1.15.1 b40c4bd
Commits on Oct 30, 2013
@tamird tamird Use ancestors' `hash_including` if available.
The previous solution didn't work because rspec does a complicated dance
with module inclusion and inheritence, so we must check this condition
at call-time, rather than include-time.
c14c194
@bblimke Merge pull request #323 from tamird/fix-hash_including
Use ancestors' `hash_including` if available.
3ce30bc
@tamird tamird spec the right thing and fix ruby 1.8 d9327b2
@bblimke Merge pull request #324 from tamird/fix-hash_including
spec the right thing and fix ruby 1.8
fbd42f1
@bblimke Version 1.15.2 56cb45c
@bblimke Merge branch 'master' of github.com:bblimke/webmock d69d175
Commits on Oct 31, 2013
@miguelff miguelff Support default (session) headers for httpclient 7f3d583
@miguelff miguelff Remove flags, and let HTTPClient behave like it does:
- modify `SAMPLE_HEADERS` to include those headers that are also sent always by HTTPClient (Accept, User-Agent and Date).
de7bfbc
Commits on Nov 03, 2013
@timcraft timcraft Fix assigned but unused variable warning a2dd1cf
@bblimke Merge pull request #326 from timcraft/patch-1
Fix assigned but unused variable warning
f6ad275
@miguelff miguelff Unmodify shared code 6de077f
Commits on Nov 04, 2013
@bblimke Merge pull request #325 from miguelff/fix-httpclient-adapter-headers
Support default (session) headers for httpclient
acb998b
Commits on Nov 11, 2013
@benpickles benpickles Don't needlessly leave File objects around, just read them directly. 46075be
@benpickles benpickles Probably want to know if spec_helper is required multiple times. 8035285
@benpickles benpickles Allow a Pathname to be passed as a Response body. cbb137b
@steookk steookk fix and improvements to API::hash_including d53d09f
Commits on Nov 12, 2013
@steookk steookk passes quality spec ce7b457
@steookk steookk improvements to #hash_including and HashIncludingMatcher specs a219c4f
@steookk steookk fix malformed whitespace ed10d3c
Commits on Nov 13, 2013
@bblimke Merge pull request #331 from benpickles/body-as-pathname
Allow a Pathname to be passed as a Response body
f740217
Commits on Nov 17, 2013
@bblimke Merge pull request #332 from steookk/master
fix to WebMock::API#hash_including
d31f4c8
@bblimke `hash_including` with an empty hash matches any hash. efee6ac
@bblimke Bump to version 1.16.0 1ba1dc4
Commits on Nov 20, 2013
@maxlinc maxlinc Add Addressable::Template (RFC 6570) support to RequestPattern 973ff35
@maxlinc maxlinc Params support for Addressable::Template is not implemented e027ec1
@maxlinc maxlinc If query is set via WebMock, then validate it with WebMock, ignoring …
…the query part of the Adressable::Template
aa86b97
Commits on Nov 27, 2013
@maxlinc maxlinc Update README.md with RFC 6570 notes a93db6d
Commits on Dec 05, 2013
@spraints spraints Support the typhoeus streaming api. 3010a29
@spraints spraints A test for support for the new Typhoeus streaming API. 4c6a821
Commits on Dec 10, 2013
@spraints spraints Swap the order of arguments to on_body callbacks. d7ba07d
@spraints spraints Add support for Typhoeus::Request#on_headers. d313b2a
Alex Stupakov and Karen Wang require 'pathname' in response.rb to fix NameError: uninitialized con…
…stant WebMock::Response::Pathname when using Test::Unit or Minitest
e7bb7f8
@bblimke Merge pull request #343 from stupakov/master
fix for #340
d3a2afc
Commits on Dec 15, 2013
@bblimke Added info about removing stub requests to README. 1b6c2b9
@bblimke Version 1.16.1 c3b2d7a
Commits on Jan 01, 2014
@bblimke Merge pull request #349 from spraints/streaming-typhoeus
Stubs for Typhoeus::Request#on_body
e89d0ec
Commits on Jan 09, 2014
@JonRowe JonRowe unit spec for query mapper examples a85ca8b
@JonRowe JonRowe convert nil to "", e.g. an empty key, prevents error with `dup` 2a7e213
Commits on Jan 12, 2014
@pravi pravi Add license statement as required. d5c2250
@pravi pravi Add license statement as required. d01ae96
@pravi pravi add license to version_checker.rb c5a9d09
@ixti ixti HTTP Gem support fcb2472
@ixti ixti Limit excon dependency version 925f243
@ixti ixti Play nice with excon >= 0.29.0 4e50296
@ixti ixti Bump minimal version of excon to 0.27.5
Resolves #347
b4f7ca4
Commits on Jan 16, 2014
@bblimke Merge pull request #352 from JonRowe/fixup_query_mapper
Fix issue where empty query key causes a `TypeError`
3c670aa
@bblimke Merge pull request #357 from vid-io/fix/excon-dependency
Limit excon dependency version
1095cde
@bblimke Merge pull request #356 from vid-io/feature/http-gem-support
HTTP Gem support
e0f9382
@bblimke Version bump to 1.17.0 f075953
Commits on Jan 17, 2014
@bblimke Merge pull request #355 from pravi/patch-1
Add license statement as required.
33c4cd6
@bblimke Version bump to 1.17.1 05ed118
@ixti ixti Stringify HTTP Gem's mock response body
This prepares for upcoming API changes of HTTP Gem.
8fca9a7
@bblimke Merge pull request #360 from vid-io/fix/http-gem-adapter-body-stringify
Stringify HTTP Gem's mock response body
2919c0e
Commits on Jan 29, 2014
@zbelzer zbelzer Adds support for chunked responses in Curb
Calls the 'on_body' callback for each 'chunk' of the body of a webmock
response if the response responds to :each and the Transfer-Encoding is
'chunked.'
f85fc15
Commits on Jan 31, 2014
@bblimke Merge pull request #363 from zbelzer/add_curb_chunked_responses
Adds support for chunked responses in Curb
61819ef
Commits on Feb 02, 2014
@bblimke http://httpstat.us/200 started returning invalid content lengths. Cha… 4e3b4f2
@bblimke Merge branch 'master' of github.com:bblimke/webmock 02a795c
@bblimke Fixed handling of request body passed as a hash to `Typhoeus.post` 9a3988c
@bblimke Version 1.17.2 f6d7d3f
Commits on Feb 03, 2014
@kiela kiela Travis CI does not support neither rbx-18mode nor rbx-19mode eecfe5b
@kiela kiela Add Travis CI support for Ruby 2.1.0 and head f94feb9
@kiela kiela Extend Travis CI support for JRuby ad2811d
@bblimke Merge pull request #364 from kiela/master
Improve Travis CI support
6c50b9a
Commits on Feb 11, 2014
@bjeanes bjeanes Fix Rack response mutating request headers b8f65c8
Commits on Feb 12, 2014
@bblimke Merge pull request #367 from bjeanes/stop-mutating-headers-in-rack-re…
…sponse

Fix Rack response mutating request headers
5ea07eb
@bblimke Moved spec to appropriate file. 9e15578
@bblimke Version 1.17.3 90c3bb2
Commits on Feb 13, 2014
@maxlinc maxlinc Merge branch 'master' into addressable
Conflicts:
	README.md
64809ff
@maxlinc maxlinc Fix text [ci_skip] a475cc5
Commits on Mar 02, 2014
@robolson robolson Update matchers for RSpec 3's matcher protocol
Resolves this deprecation message from RSpec 3:

WebMock::WebMockMatcher implements a legacy RSpec matcher
protocol. For the current protocol you should expose the failure messages
via the `failure_message` and `failure_message_when_negated` methods.
a4eb976
@bblimke Merge pull request #372 from robolson/rspec3-matcher-compat
Update matchers for RSpec 3's matcher protocol
76191ac
@bblimke Version bump to 1.17.4 adc813f
Commits on Mar 04, 2014
@maxlinc maxlinc Merge branch 'master' of github.com:bblimke/webmock into addressable
Conflicts:
	README.md
a506403
Commits on Mar 05, 2014
@bblimke Merge pull request #334 from maxlinc/addressable
RFC 6570 (URI Template) support for URIPattern
0f0de80
Commits on Mar 27, 2014
@Claster Claster Fix CONTENT_LENGTH in RackResponse 01d8f0f
@bblimke Merge pull request #379 from Claster/master
Fix CONTENT_LENGTH in RackResponse
628c4b0
Commits on Mar 30, 2014
@hc5duke hc5duke Add some missing Curl::Easy aliases 564c404
Commits on Mar 31, 2014
@bblimke Merge pull request #380 from hc5duke/master
Add some missing Curl::Easy aliases
7fe2a20
Commits on Apr 05, 2014
@ixti ixti Update Ruby HTTP Gem adapter to be 0.6.0 compat 4c5d4e9
Commits on Apr 06, 2014
@ixti ixti Do not #force_encoding if it's not available 1bd6430
Commits on Apr 07, 2014
@insoul insoul query mapping test b453644
@insoul insoul query mapping fix 2c8cebf
Commits on Apr 08, 2014
@bblimke Merge pull request #382 from ixti/improve/http-gem-adapter
Update Ruby HTTP Gem adapter to be 0.6.0 compat
8e70c6f
Commits on Apr 09, 2014
@insoul insoul support 1.8.7 9a9c57d
Commits on Apr 13, 2014
@hsbt hsbt handled NameError caused by Minitest5 b7b1398
Commits on Apr 14, 2014
@bblimke Merge pull request #386 from hsbt/minitest5
Handled NameError with Minitest 5
782b7d8
Commits on Apr 16, 2014
@hsbt hsbt remove needless assignment 433b202
@hsbt hsbt style 2376970
@bblimke Merge pull request #388 from hsbt/fixup-minitest
Fixup minitest usage
a3b349f
Commits on May 13, 2014
@bblimke Upgraded dependency on Addressable to versions >= 2.3.6 ec820ec
@bblimke Version 1.18.0 0cd6a12
Commits on May 21, 2014
@insoul insoul hash mapping fix bf266be
Commits on May 23, 2014
Carlos Alonso Improved cookies support for em-http-request. Added method to get res…
…ponse cookies
d702b89
Commits on May 27, 2014
Carlos Alonso moved hash to old ruby style 3866449
Commits on May 28, 2014
@ixti ixti Fix HTTP Gem replayed Response object's init
0.6.x version introduced optional last argument of Response object:
request's uri. That allows for example to figure out a real URI after
following redirects. This patch brinsg this ability to HTTP Gem adapter.
321bd54
Commits on May 31, 2014
@bblimke Merge pull request #393 from ixti/fix/http-gem-with-follows
Fix HTTP Gem replayed Response object's init
16a7259
Commits on Jun 01, 2014
@bblimke Merge pull request #392 from calonso/improve_em_http_request_cookies_…
…support

Improved cookies support for WebMockHttpClient
03914e2
Carlos Alonso moved cookies tests to proper file 4fd9074
@bblimke Merge pull request #394 from calonso/improve_em_http_request_cookies_…
…support

moved cookies tests to proper file
2a587b2
Commits on Jun 20, 2014
@trlorenz trlorenz httpclient response header receives request_method, request_uri, and …
…request_query transferred from httpclient request header
50da9b4
Commits on Jun 21, 2014
@bblimke Merge pull request #399 from trlorenz/httpclient_rsp_hdr_receives_req…
…_hdr_parms

Allow xfer of parms from httpclient request header to response header
bf5ea1d
Commits on Jun 22, 2014
@simonoff simonoff Fix for #337 with refactoring and more tests 963abd8
@simonoff simonoff More tests for #to_query 9704616
@simonoff simonoff Fix 1.8.7 support 5984051
@bblimke Merge pull request #345 from dotpromo/master
QueryMapper parses query strings including nested params
6b5374c
Commits on Jul 11, 2014
@calebthompson calebthompson Fix minor syntax error in README ecde330
Commits on Aug 09, 2014
@davidjairala davidjairala use VALID_REQUEST_KEYS constant for Excon if defined
Addresses #403
65fddb8
Commits on Aug 10, 2014
@davidjairala davidjairala old-school rockets 7fc83fb
@bblimke Merge pull request #405 from davidjairala/fix-excon-request-keys
use VALID_REQUEST_KEYS constant for Excon if defined
5491927
Commits on Aug 28, 2014
@thhermansen thhermansen Typhoeus req with method as string matches stub where method given as…
… sym
8cc4d5e
Commits on Aug 29, 2014
@thhermansen thhermansen Moved spec covering method given as string issue to shared example. bc6506f
Commits on Aug 30, 2014
@bblimke Merge pull request #408 from thhermansen/fix-hydra-method-matcher
Symbolize method in RequestSignature
7c52b6b
Commits on Sep 21, 2014
Mark Lorenz refactor errors_spec 9030ba2
Mark Lorenz allow stubbing instructions to be disabled.
`Webmock.hide_stubbing_instructions!` will turn the instructions off
`Webmock.show_stubbing_instructions!` turns them back on again
aa11b13
Commits on Sep 23, 2014
@bblimke Merge pull request #412 from covermymeds/configurable-instructions
Configurable instructions
a340f83
Commits on Sep 27, 2014
@bblimke Merge branch '227-discarded-repeated-params' of github.com:Talkdesk/w…
…ebmock into Talkdesk-227-discarded-repeated-params

Conflicts:
	lib/webmock/config.rb
	lib/webmock/util/query_mapper.rb
4cf324c
@bblimke Merge branch 'Talkdesk-227-discarded-repeated-params' 1f5d9e4
@bblimke Merge branch 'fix_query_mapper' of github.com:insoul/webmock into ins…
…oul-fix_query_mapper

Conflicts:
	lib/webmock/util/query_mapper.rb
e5f3322
@bblimke t push origin masterMerge branch 'insoul-fix_query_mapper' c8500f6
@bblimke Merge pull request #402 from calebthompson/fix-readme-syntax
Fix minor syntax error in README
d4f1768
Commits on Sep 28, 2014
@bblimke Ensured all specs that require network connectivity don't run when ne…
…twork is disabled.
d141182
@bblimke Merge branch 'master' of github.com:bblimke/webmock fae235c
@bblimke Brought back support for latest versions of Excon! 7ff740d
@bblimke WebMock requires HTTP gem > 0.6.0 5f3ebf7
@bblimke Allow users to specify stub options as symbols or keys. 0c0fdc5
@bblimke Fixed issue with Excon adapter giving warning message when redirects …
…middleware was enabled.
f4bcb29
@bblimke Version 1.19.0 ad4b6e4
Commits on Oct 18, 2014
@deivid-rodriguez deivid-rodriguez Add 2.1 compatibility to README.md [ci skip]
It is supported, right?
be68b19
Commits on Oct 19, 2014
@astathopoulos astathopoulos Add support for on_missing callback of Curb::Easy
According to the documention (https://github.com/taf2/curb#easy-callbacks)
on_missing callback is called when the response code is 4xx.
7cfb91c
@bblimke Merge pull request #421 from astathopoulos/add_on_missing_callback_su…
…pport

Add support for on_missing callback of Curb::Easy
107ef87
@bblimke Fixed excon spec after exxon was fixed. 65f59d1
@bblimke Merge branch 'master' of github.com:bblimke/webmock 2dc544e
Commits on Oct 20, 2014
@Capncavedan Capncavedan add at_least_times and at_most_times matchers 0577e7a
Commits on Oct 22, 2014
@bblimke Merge pull request #422 from MerchantsBonding/add-at-least-no-more-th…
…an-matchers

Add at_least_times and at_most_times matchers
be98a45
@bblimke Version 1.20.0 cfe9119
Commits on Oct 23, 2014
@Capncavedan Capncavedan insert assert_requested and assert_not_requested at_least_times and a…
…t_most_times matchers
8c3d8f7
Commits on Oct 24, 2014
@sriedel sriedel Silence 'instance variable undefined' warnings
These changes silence ruby interpreter warnings about undefined instance variables that can fill up the output and slow down tests considerably.
0469560
@bblimke Merge pull request #424 from MerchantsBonding/update-assert_requested…
…-with-at_least-at_most

assert_requested & assert_not_requested at_least_times & at_most_times matchers
af8d887
Commits on Oct 26, 2014
Mark Lorenz fix typo shound -> should cf86690
Mark Lorenz Provides a helpful error message if a bad response body given. 6f62fb7
Commits on Nov 02, 2014
@bblimke Merge pull request #425 from sriedel/patch-1
Silence 'instance variable undefined' warnings
92fa124
@bblimke Version 1.20.1 da534f7
@bblimke Merge pull request #420 from deivid-rodriguez/patch-1
Add 2.1 compatibility to README.md [ci skip]
3e9562e
@bblimke Merge pull request #427 from covermymeds/error-on-invalid-body
Error on invalid body
94d71c7
@bblimke Version 1.20.2 15c9801
Commits on Nov 04, 2014
@godfat godfat Fix for httpclient 2.5.3+
Checkout:
nahi/httpclient@v2.5.2...v2.5.3#diff-9c128a1e92647c91c6efad47c0709bf7L198

In 2.5.2, it's taking the `uri`, but in 2.5.3, it's taking the `req`.
We could also detect by versions, but I chose to detect by if
`default_header` is defined here:
nahi/httpclient@v2.5.2...v2.5.3#diff-2b61e1f08102d46865dd580cfa9bc88aR329

Either way should be fine, no strong opinions here.
(Detecting by method signature would be the best, but the arity
 is the same, and I am not sure how else we could detect)
a266b26
Commits on Nov 05, 2014
@bblimke Merge pull request #430 from godfat/adopt-httpclient-2.5.3
Fix for httpclient 2.5.3+
0e20ee5
@bblimke Added info to README to ensure `have_requested` matcher is invoked wi…
…th a block declared with curly brackets, to ensure correct binding precedence.
d7da183
@bblimke Raising error if arguments provided to RequestPattern `with` are inva…
…lid.
77853d9
@bblimke Ensured Response can't be created with invalid options. I.e by using …
…`to_return`
505e975
@bblimke Added assertion to ensure #with can't be invoked with no arguments an…
…d no block.
5554c0d
@bblimke Removed incorrectly committed spec. 0d71ab9
@bblimke Ensured minitest_tu_shim 1.3.2 is used. With 1.3.3 we get dependency …
…conflict.
22c3192
@bblimke httpclient 2.5.3.1 brought back WebMock compatibility so we can rever…
…t the 2.5.3 patch.
a9150d9
@bblimke Fixed `assert_requested` not to pass `times` option as RequestPattern…
… options.
515baaa
@bblimke Fixed incorrectly declared spec examples, which were discovered by va…
…lidating #with options.
e344922
@bblimke Version 1.20.3 7e99832
Commits on Nov 09, 2014
@bblimke Convert specs to RSpec 2.99.2 syntax with Transpec
This conversion is done by Transpec 2.3.7 with the following command:
    transpec

* 604 conversions
    from: obj.should
      to: expect(obj).to

* 400 conversions
    from: == expected
      to: eq(expected)

* 98 conversions
    from: lambda { }.should
      to: expect { }.to

* 65 conversions
    from: obj.should_not
      to: expect(obj).not_to

* 59 conversions
    from: lambda { }.should_not
      to: expect { }.not_to

* 18 conversions
    from: obj.should_receive(:message)
      to: expect(obj).to receive(:message)

* 13 conversions
    from: obj.stub(:message)
      to: allow(obj).to receive(:message)

* 12 conversions
    from: be_true
      to: be_truthy

* 8 conversions
    from: be_false
      to: be_falsey

* 6 conversions
    from: === expected
      to: be === expected

* 4 conversions
    from: =~ /pattern/
      to: match(/pattern/)

* 4 conversions
    from: obj.should_not_receive(:message)
      to: expect(obj).not_to receive(:message)

* 2 conversions
    from: pending
      to: skip

* 1 conversion
    from: collection.should have(n).items
      to: expect(collection.size).to eq(n)

For more details: https://github.com/yujinakayama/transpec#supported-conversions
a0a2cab
@bblimke Added support for Spec >= 3.0.0 `hash_including` with AnyArgMatcher. …
…i.e. hash_including(:a, :b => :c)
5657f2e
@bblimke WebMock specs use Spec >= 3.1.0 b9a2707
@bblimke Fixed deprecation notice in RSpec 3.1 373a65c
@bblimke Updated examples in README to RSpec 3 'expect' syntax. 2c2357d
@bblimke Removed unused code. a39de7f
@bblimke Version 1.20.4 58b3c96
@kovdavid kovdavid Update fakeweb-matcher url in README 30865b9
@bblimke Merge pull request #434 from DavsX/fix/readme_fakeweb_url_update
Update fakeweb-matcher url in README
5860e91
Commits on Jan 25, 2015
@bblimke Fixed example in README. 9360ac0
Commits on Jan 26, 2015
@frankywahl frankywahl Allow RSpec like syntax
This PR allows a more intuitive approach when using RSpec.
Since double and mock in RSpec already permit a `.and_return` syntax,
mimic this behaviour in webmock for easier reading and integration.
d72d2b7
@fishermand46 fishermand46 Remove unnecessary @query_params.nil? check
In this branch, we already know that @query_params is not nil. Looks like this was the result of a copy-pasta. :P
a3f231c
Commits on Jan 27, 2015
@bblimke Merge pull request #448 from fishermand46/patch-1
Remove unnecessary @query_params.nil? check
514f24e
@bblimke Merge pull request #447 from OpenSourceProjects/rspec_3
Allow RSpec like syntax
53f2787
Commits on Feb 03, 2015
@yous yous Keep line length of code blocks to 80 c938b6b
@yous yous Use `do...end` block and add spacing 0806a94
@yous yous Clean up markdown syntax of README.md 6384cfd
Commits on Feb 11, 2015
@bblimke Merge pull request #450 from yous/clean-up
Clean up README.md
bea328b
Commits on Feb 19, 2015
@simonrussell simonrussell Detect presence of HTTP gem a little more cleanly. 7aa128f
Commits on Feb 22, 2015
@bblimke Merge pull request #456 from simonrussell/http-gem-play-nicely
Detect presence of HTTP gem a little more cleanly.
9bdac67
Commits on Mar 24, 2015
Steve Mitchell add MRI 2.2.1 to travis.yml 539c107
@bblimke Merge pull request #460 from theSteveMitchell/master
Add MRI 2.2.1 to travis CI
6e08930
Commits on Mar 29, 2015
@bblimke WebMock specs currently don't pass against ruby gems Curb 0.8.7, ther…
…efore 0.8.7 is not supported yet.
f1cfb18
@bblimke Latest Patron version 0.4.20, doesn't work against Ruby 1.8.7. Let's …
…test against 0.4.18 on Ruby 1.8.7
ab3c5f3
@zanker zanker Update http.rb adapter 68cddce
@bblimke Merge pull request #462 from ixti/http-fixes
Update http.rb adapter
ebf201e
@bblimke Version bump to 1.21.0 eec6914
Commits on Apr 06, 2015
@PeterDaveHello PeterDaveHello Use svg instead of png to get better image quality 3fab206
Commits on Apr 07, 2015
@bblimke Merge pull request #464 from PeterDaveHello/patch-1
Use svg instead of png to get better image quality
9e7162f
Commits on Apr 30, 2015
@mpalmer mpalmer Fix em_http_request adapter for correct timeout+request handling
em-http-request allows you to send multiple requests on the same
EM::HTTPConnection object, which is mostly useful for pipelining.  If the
underlying TCP connection drops, it will be re-established if another
request is made on the same connection object.

In testing that a user of em-http-request correctly dealt with timeouts (by
retrying the request on the same connection object), it was discovered that
webmock does not correctly emulate the real-world behaviour of
em-http-request, and the parsed response data was being sent to the wrong
`EM::HTTPClient` instance.  This commit provides a failing test case (along
with a test case that succeeded already, to ensure the basic behaviour
continues to work in the future), along with a small change to the adapter
code to correctly handle the change in clients after a timeout.
4894645
Commits on May 01, 2015
@presidentJFK presidentJFK fix spelling mistake stib -> stub 4ab9d83
@presidentJFK presidentJFK restrict http version for ruby 1.8.7 47eeb40
Commits on May 07, 2015
@bblimke Merge pull request #473 from presidentJFK/fix-travis
Fix travis
a76990f
@bblimke Merge pull request #471 from mpalmer/timeout-request
Fix em_http_request adapter for correct timeout+request handling
7318614
Commits on May 10, 2015
@presidentJFK presidentJFK update readme to reflect rake task name change
  rake task name changed in 9948087
71f6df0
@presidentJFK presidentJFK Merge pull request #477 from presidentJFK/readme-fix
update readme to reflect rake task name change
8b31754