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

[Praveen Arimbrathodiyil]

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

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

commit 99c2fd60e2310b113f0ba28e767c212cb6fef553
Merge: 19fd655 dd65928
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Tue Jan 14 22:21:09 2014 +0530

    Merge tag 'upstream/1.16.1'
    
    Upstream version 1.16.1

 .gitignore                                         |   2 +
 .rvmrc                                             |   1 -
 .travis.yml                                        |   5 +-
 CHANGELOG.md                                       | 139 ++++-
 Gemfile                                            |   5 +-
 Guardfile                                          |  24 -
 README.md                                          | 602 +++++++++++++--------
 Rakefile                                           |  12 -
 lib/webmock/api.rb                                 |  28 +-
 lib/webmock/errors.rb                              |   2 +-
 lib/webmock/http_lib_adapters/curb_adapter.rb      |   4 +-
 .../em_http_request/em_http_request_1_x.rb         |   3 +-
 lib/webmock/http_lib_adapters/excon_adapter.rb     |  22 +-
 .../http_lib_adapters/httpclient_adapter.rb        |  27 +-
 lib/webmock/http_lib_adapters/net_http.rb          |  42 +-
 lib/webmock/matchers/hash_including_matcher.rb     |  11 +
 lib/webmock/minitest.rb                            |  15 +-
 lib/webmock/rack_response.rb                       |   5 +
 lib/webmock/response.rb                            |   6 +-
 lib/webmock/util/query_mapper.rb                   |  12 +-
 lib/webmock/util/uri.rb                            |  15 +-
 lib/webmock/version.rb                             |   2 +-
 lib/webmock/webmock.rb                             |  26 +-
 metadata.yml                                       |  34 +-
 minitest/test_helper.rb                            |  11 +-
 minitest/test_webmock.rb                           |   6 +-
 minitest/webmock_spec.rb                           |   6 +-
 spec/acceptance/curb/curb_spec.rb                  |   9 +-
 spec/acceptance/curb/curb_spec_helper.rb           |   2 +-
 .../em_http_request/em_http_request_spec.rb        |  24 +
 .../em_http_request/em_http_request_spec_helper.rb |   1 +
 spec/acceptance/excon/excon_spec.rb                |   2 +-
 spec/acceptance/httpclient/httpclient_spec.rb      |  52 ++
 spec/acceptance/net_http/net_http_shared.rb        |  23 +-
 spec/acceptance/net_http/net_http_spec.rb          |  10 +
 .../shared/allowing_and_disabling_net_connect.rb   |   4 +-
 spec/acceptance/shared/callbacks.rb                |  10 +-
 .../shared/returning_declared_responses.rb         |   6 +-
 spec/acceptance/shared/stubbing_requests.rb        |  80 ++-
 spec/spec_helper.rb                                |   6 +-
 spec/support/network_connection.rb                 |   2 +-
 spec/support/webmock_server.rb                     |   6 +-
 spec/unit/api_spec.rb                              |  75 +++
 spec/unit/errors_spec.rb                           |  40 +-
 spec/unit/matchers/hash_including_matcher_spec.rb  |  87 +++
 spec/unit/request_execution_verifier_spec.rb       |   2 +-
 spec/unit/response_spec.rb                         |  18 +-
 spec/unit/util/uri_spec.rb                         |  13 +
 test/shared_test.rb                                |   4 +-
 test/test_helper.rb                                |   2 +-
 webmock.gemspec                                    |   4 +-
 51 files changed, 1139 insertions(+), 410 deletions(-)

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