[DRE-commits] [ruby-rspec-expectations] 01/06: Merge tag 'upstream/2.14.1'

[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-rspec-expectations.

commit dd29556c523cf5d1e6c6aeca59195de6d863c3bf
Merge: c780341 1b4ec60
Author: Cédric Boutillier <boutil at debian.org>
Date:   Sat Aug 10 18:31:00 2013 +0200

    Merge tag 'upstream/2.14.1'
    
    Upstream version 2.14.1
    
    # gpg: Signature faite le sam. 10 août 2013 18:31:00 CEST avec la clef RSA d'identifiant 8F9F8F09
    # 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> »

 Changelog.md                                       |   55 ++++
 README.md                                          |  130 +++------
 features/README.md                                 |   17 +-
 features/built_in_matchers/README.md               |   82 +++---
 features/built_in_matchers/be_within.feature       |    6 +-
 features/built_in_matchers/expect_change.feature   |   12 +-
 features/built_in_matchers/expect_error.feature    |    4 +-
 features/built_in_matchers/start_with.feature      |    2 +-
 features/built_in_matchers/throw_symbol.feature    |   22 +-
 features/built_in_matchers/yield.feature           |   21 +-
 .../define_diffable_matcher.feature                |    2 +-
 .../define_matcher_outside_rspec.feature           |   12 +-
 .../define_matcher_with_fluent_interface.feature   |    2 +-
 features/customized_message.feature                |    2 +-
 features/support/env.rb                            |   11 +-
 features/support/rubinius.rb                       |    6 +
 features/syntax_configuration.feature              |    3 +
 features/test_frameworks/test_unit.feature         |   32 +--
 lib/rspec/expectations.rb                          |    2 +-
 lib/rspec/expectations/deprecation.rb              |   45 +--
 lib/rspec/expectations/differ.rb                   |   43 ++-
 lib/rspec/expectations/expectation_target.rb       |   15 +-
 lib/rspec/expectations/extensions/object.rb        |   14 +-
 lib/rspec/expectations/fail_with.rb                |   12 +-
 lib/rspec/expectations/handler.rb                  |   17 +-
 lib/rspec/expectations/syntax.rb                   |    4 +-
 lib/rspec/expectations/version.rb                  |    2 +-
 lib/rspec/matchers.rb                              |  284 ++++++++++---------
 lib/rspec/matchers/be_close.rb                     |    2 +-
 lib/rspec/matchers/built_in/be.rb                  |    2 +
 lib/rspec/matchers/built_in/be_within.rb           |    2 +-
 lib/rspec/matchers/built_in/change.rb              |   10 +-
 lib/rspec/matchers/built_in/have.rb                |   24 +-
 lib/rspec/matchers/built_in/include.rb             |   12 +-
 lib/rspec/matchers/built_in/raise_error.rb         |   30 +-
 lib/rspec/matchers/built_in/yield.rb               |   81 +++++-
 lib/rspec/matchers/operator_matcher.rb             |    2 +-
 lib/rspec/matchers/pretty.rb                       |    8 +-
 lib/rspec/matchers/test_unit_integration.rb        |   11 +
 metadata.yml                                       |   17 +-
 spec/rspec/expectations/differ_spec.rb             |   43 ++-
 spec/rspec/expectations/expectation_target_spec.rb |   13 +-
 spec/rspec/expectations/extensions/kernel_spec.rb  |   10 +-
 spec/rspec/expectations/fail_with_spec.rb          |   19 ++
 spec/rspec/expectations/handler_spec.rb            |   63 +++--
 spec/rspec/expectations/syntax_spec.rb             |   48 +++-
 spec/rspec/matchers/be_close_spec.rb               |   12 +-
 spec/rspec/matchers/be_spec.rb                     |   72 ++---
 spec/rspec/matchers/be_within_spec.rb              |    8 +
 spec/rspec/matchers/change_spec.rb                 |   23 +-
 spec/rspec/matchers/configuration_spec.rb          |  146 ++++------
 spec/rspec/matchers/description_generation_spec.rb |   18 +-
 spec/rspec/matchers/exist_spec.rb                  |   18 +-
 spec/rspec/matchers/has_spec.rb                    |    2 +-
 spec/rspec/matchers/have_spec.rb                   |   14 +-
 .../matchers/include_matcher_integration_spec.rb   |    4 +-
 spec/rspec/matchers/include_spec.rb                |    8 +-
 spec/rspec/matchers/match_array_spec.rb            |    2 +-
 spec/rspec/matchers/match_spec.rb                  |    2 +-
 spec/rspec/matchers/raise_error_spec.rb            |  288 +++++++++++++-------
 spec/rspec/matchers/respond_to_spec.rb             |    8 +-
 spec/rspec/matchers/satisfy_spec.rb                |    2 +-
 spec/rspec/matchers/start_with_end_with_spec.rb    |    4 +-
 spec/rspec/matchers/yield_spec.rb                  |   85 +++++-
 spec/spec_helper.rb                                |    2 +-
 65 files changed, 1225 insertions(+), 749 deletions(-)

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