[DRE-commits] [ruby-webmock] 01/04: Merge tag 'upstream/1.19.0'

[Cédric Boutillier]

This is an automated email from the git hooks/post-receive script.

boutil pushed a commit to branch master
in repository ruby-webmock.

commit 3c7f537688be68c7ffbaa33f092370be9084f646
Merge: 37a7c55 e54087a
Author: Cédric Boutillier <boutil at debian.org>
Date:   Tue Sep 30 22:25:22 2014 +0200

    Merge tag 'upstream/1.19.0'
    
    Upstream version 1.19.0
    
    # gpg: Signature faite le mar. 30 sept. 2014 22:25:19 CEST avec la clef RSA d'identifiant 39CD217A
    # gpg: Bonne signature de « Cédric Boutillier <boutil at debian.org> »
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at upmc.fr> »
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at polytechnique.org> »
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at gmail.com> »

 .gitignore                                         |   5 +-
 CHANGELOG.md                                       |  46 +++
 README.md                                          |  12 +-
 lib/webmock/config.rb                              |   6 +
 lib/webmock/errors.rb                              |  16 +-
 .../em_http_request/em_http_request_1_x.rb         |  30 +-
 lib/webmock/http_lib_adapters/excon_adapter.rb     |   8 +-
 lib/webmock/http_lib_adapters/http_gem/response.rb |   5 +-
 lib/webmock/http_lib_adapters/http_gem/webmock.rb  |   2 +-
 .../http_lib_adapters/httpclient_adapter.rb        |   8 +-
 lib/webmock/matchers/hash_including_matcher.rb     |   2 +-
 lib/webmock/request_pattern.rb                     |  21 +-
 lib/webmock/request_signature.rb                   |   2 +-
 lib/webmock/request_stub.rb                        |   2 +-
 lib/webmock/util/hash_keys_stringifier.rb          |   8 +-
 lib/webmock/util/query_mapper.rb                   | 372 +++++++++++++--------
 lib/webmock/util/uri.rb                            |   7 +-
 lib/webmock/version.rb                             |   2 +-
 lib/webmock/webmock.rb                             |  12 +
 metadata.yml                                       |  22 +-
 .../em_http_request/em_http_request_spec.rb        |  73 ++++
 spec/acceptance/excon/excon_spec.rb                |  20 +-
 spec/acceptance/http_gem/http_gem_spec.rb          |   9 +
 spec/acceptance/httpclient/httpclient_spec.rb      |  14 +-
 .../httpclient/httpclient_spec_helper.rb           |   2 +-
 spec/acceptance/patron/patron_spec_helper.rb       |   1 +
 spec/acceptance/shared/request_expectations.rb     |  18 +
 spec/acceptance/shared/stubbing_requests.rb        |   5 +
 spec/unit/errors_spec.rb                           |  68 +++-
 spec/unit/request_pattern_spec.rb                  |  15 +
 spec/unit/request_signature_spec.rb                |   3 +
 spec/unit/util/hash_keys_stringifier_spec.rb       |   2 +-
 spec/unit/util/query_mapper_spec.rb                | 108 +++++-
 spec/unit/util/uri_spec.rb                         |  29 ++
 webmock.gemspec                                    |   4 +-
 35 files changed, 707 insertions(+), 252 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-webmock.git