[DRE-commits] [ruby-webmock] 01/08: Merge tag 'upstream/1.22.6'

Antonio Terceiro terceiro at moszumanska.debian.org
Sun Jan 31 21:31:03 UTC 2016


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

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

commit 2c8b491a821cd4e3e849db7109c93f7aec590749
Merge: f544767 a0b2d6f
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Fri Jan 22 11:45:31 2016 -0200

    Merge tag 'upstream/1.22.6'
    
    Upstream version 1.22.6
    
    # gpg: Signature made Sex 22 Jan 2016 11:45:30 BRST using RSA key ID CD460BDE
    # gpg: Good signature from "Antonio Terceiro <terceiro at softwarelivre.org>"
    # gpg:                 aka "Antonio Terceiro <terceiro at dcc.ufba.br>"
    # gpg:                 aka "Antonio Terceiro <terceiro at colivre.coop.br>"
    # gpg:                 aka "Antonio Terceiro <terceiro at debian.org>"

 .gitignore                                         |   1 +
 .travis.yml                                        |  21 +-
 Appraisals                                         |   3 +
 CHANGELOG.md                                       | 151 +++++
 Gemfile                                            |   4 +-
 README.md                                          | 175 ++++--
 gemfiles/ruby_1_8.gemfile                          |  19 +
 lib/webmock.rb                                     |  18 +-
 lib/webmock/api.rb                                 |  25 +-
 lib/webmock/config.rb                              |   2 +
 lib/webmock/errors.rb                              |  24 +-
 lib/webmock/http_lib_adapters/curb_adapter.rb      |  34 +-
 .../em_http_request/em_http_request_1_x.rb         |   8 +-
 lib/webmock/http_lib_adapters/http_gem/response.rb |  22 -
 lib/webmock/http_lib_adapters/http_gem/streamer.rb |  13 -
 lib/webmock/http_lib_adapters/http_gem_adapter.rb  |  38 --
 .../{http_gem => http_rb}/client.rb                |   2 +-
 .../{http_gem => http_rb}/request.rb               |   0
 lib/webmock/http_lib_adapters/http_rb/response.rb  |  43 ++
 lib/webmock/http_lib_adapters/http_rb/streamer.rb  |  25 +
 .../{http_gem => http_rb}/webmock.rb               |  10 +-
 lib/webmock/http_lib_adapters/http_rb_adapter.rb   |  37 ++
 .../http_lib_adapters/httpclient_adapter.rb        |  40 +-
 lib/webmock/http_lib_adapters/manticore_adapter.rb | 123 ++++
 lib/webmock/http_lib_adapters/net_http.rb          |  36 +-
 .../http_lib_adapters/typhoeus_hydra_adapter.rb    |   3 +-
 lib/webmock/matchers/hash_including_matcher.rb     |   2 +-
 lib/webmock/request_body_diff.rb                   |  63 ++
 lib/webmock/request_execution_verifier.rb          |  54 +-
 lib/webmock/request_pattern.rb                     |   6 +-
 lib/webmock/request_signature.rb                   |   6 +-
 lib/webmock/request_signature_snippet.rb           |  61 ++
 lib/webmock/request_stub.rb                        |   3 +
 lib/webmock/response.rb                            |  28 +-
 lib/webmock/rspec/matchers.rb                      |   1 -
 .../rspec/matchers/request_pattern_matcher.rb      |  34 ++
 lib/webmock/rspec/matchers/webmock_matcher.rb      |   4 +
 lib/webmock/stub_request_snippet.rb                |   4 +
 lib/webmock/util/hash_validator.rb                 |  17 +
 lib/webmock/util/json.rb                           |  31 +-
 lib/webmock/util/query_mapper.rb                   |  12 +-
 lib/webmock/version.rb                             |   2 +-
 lib/webmock/webmock.rb                             |  12 +
 metadata.yml                                       | 296 ++++------
 spec/acceptance/curb/curb_spec.rb                  |  95 +--
 .../em_http_request/em_http_request_spec.rb        | 110 +++-
 spec/acceptance/excon/excon_spec.rb                |  22 +-
 .../http_gem_spec.rb => http_rb/http_rb_spec.rb}   |  30 +-
 .../http_rb_spec_helper.rb}                        |  12 +-
 spec/acceptance/httpclient/httpclient_spec.rb      |  43 +-
 spec/acceptance/manticore/manticore_spec.rb        |  56 ++
 spec/acceptance/manticore/manticore_spec_helper.rb |  31 +
 spec/acceptance/net_http/net_http_shared.rb        |  46 +-
 spec/acceptance/net_http/net_http_spec.rb          |  87 ++-
 spec/acceptance/patron/patron_spec.rb              |  26 +-
 .../shared/allowing_and_disabling_net_connect.rb   |  67 ++-
 spec/acceptance/shared/callbacks.rb                |  37 +-
 .../shared/complex_cross_concern_behaviors.rb      |   6 +-
 .../shared/enabling_and_disabling_webmock.rb       |  20 +-
 spec/acceptance/shared/precedence_of_stubs.rb      |   4 +-
 spec/acceptance/shared/request_expectations.rb     | 653 +++++++++++++--------
 .../shared/returning_declared_responses.rb         | 184 +++---
 spec/acceptance/shared/stubbing_requests.rb        | 206 +++----
 spec/acceptance/typhoeus/typhoeus_hydra_spec.rb    |  30 +-
 spec/quality_spec.rb                               |   6 +-
 spec/spec_helper.rb                                |  10 +-
 spec/support/webmock_server.rb                     |   2 +-
 spec/unit/errors_spec.rb                           |  81 ++-
 .../http_lib_adapter_registry_spec.rb              |   2 +-
 .../http_lib_adapters/http_lib_adapter_spec.rb     |   4 +-
 spec/unit/rack_response_spec.rb                    |  32 +-
 spec/unit/request_body_diff_spec.rb                |  90 +++
 spec/unit/request_execution_verifier_spec.rb       | 176 ++++--
 spec/unit/request_pattern_spec.rb                  | 408 ++++++-------
 spec/unit/request_registry_spec.rb                 |  19 +-
 spec/unit/request_signature_snippet_spec.rb        |  89 +++
 spec/unit/request_signature_spec.rb                | 117 ++--
 spec/unit/request_stub_spec.rb                     | 107 ++--
 spec/unit/response_spec.rb                         | 101 ++--
 spec/unit/stub_registry_spec.rb                    |  32 +-
 spec/unit/stub_request_snippet_spec.rb             |  16 +-
 spec/unit/util/hash_counter_spec.rb                |  12 +-
 spec/unit/util/hash_keys_stringifier_spec.rb       |   2 +-
 spec/unit/util/headers_spec.rb                     |   8 +-
 spec/unit/util/json_spec.rb                        |  32 +-
 spec/unit/util/query_mapper_spec.rb                |  21 +-
 spec/unit/util/uri_spec.rb                         |  60 +-
 spec/unit/util/version_checker_spec.rb             |  18 +-
 spec/unit/webmock_spec.rb                          |   6 +-
 test/shared_test.rb                                |   4 +-
 webmock.gemspec                                    |  15 +-
 91 files changed, 3149 insertions(+), 1599 deletions(-)

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



More information about the Pkg-ruby-extras-commits mailing list