[DRE-commits] [ruby-rspec-mocks] 01/04: Merge tag 'upstream/2.14.2'

Cédric Boutillier boutil at alioth.debian.org
Thu Aug 15 19:58:28 UTC 2013


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

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

commit 7e66849670b8208c5d94de47e055107b08994150
Merge: f85188d c668c1e
Author: Cédric Boutillier <boutil at debian.org>
Date:   Tue Aug 6 15:55:11 2013 +0200

    Merge tag 'upstream/2.14.2'
    
    Upstream version 2.14.2
    
    # gpg: Signature faite le mar. 06 août 2013 15:55:05 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                                       |   96 ++++++
 README.md                                          |    2 +-
 features/argument_matchers/README.md               |    4 +-
 features/argument_matchers/explicit.feature        |    5 +-
 .../argument_matchers/general_matchers.feature     |    4 +-
 features/argument_matchers/type_matchers.feature   |    7 +-
 features/message_expectations/README.md            |    4 +-
 .../allow_any_instance_of.feature                  |   26 ++
 features/message_expectations/any_instance.feature |    4 +-
 .../block_local_expectations.feature.pending       |    6 +-
 .../expect_any_instance_of.feature                 |   27 ++
 .../message_expectations/expect_message.feature    |   94 ------
 .../expect_message_using_expect.feature            |  107 ++++++
 .../expect_message_using_should_receive.feature    |  118 +++++++
 .../message_expectations/receive_counts.feature    |    2 +-
 features/method_stubs/README.md                    |   32 +-
 features/method_stubs/any_instance.feature         |   24 +-
 features/method_stubs/as_null_object.feature       |    9 +-
 .../simple_return_value_with_allow.feature         |   44 +++
 ...ature => simple_return_value_with_stub.feature} |    0
 features/method_stubs/stub_implementation.feature  |   28 +-
 features/method_stubs/to_ary.feature               |   12 +-
 features/outside_rspec/configuration.feature       |   20 --
 features/spies/spy_partial_mock_method.feature     |   34 ++
 features/spies/spy_pure_mock_method.feature        |   76 +++++
 features/spies/spy_unstubbed_method.feature        |   18 +
 features/step_definitions/additional_cli_steps.rb  |    7 +
 features/support/rubinius.rb                       |    6 +
 features/test_frameworks/test_unit.feature         |   43 +++
 lib/rspec/mocks.rb                                 |   78 +++--
 lib/rspec/mocks/any_instance.rb                    |   81 -----
 lib/rspec/mocks/any_instance/chain.rb              |   53 +--
 lib/rspec/mocks/any_instance/expectation_chain.rb  |   42 +--
 lib/rspec/mocks/any_instance/recorder.rb           |   12 +-
 lib/rspec/mocks/any_instance/stub_chain.rb         |   23 +-
 lib/rspec/mocks/any_instance/stub_chain_chain.rb   |   18 +-
 lib/rspec/mocks/argument_list_matcher.rb           |   10 +-
 lib/rspec/mocks/configuration.rb                   |   29 +-
 lib/rspec/mocks/deprecation.rb                     |   18 +
 lib/rspec/mocks/error_generator.rb                 |   75 ++++-
 lib/rspec/mocks/errors.rb                          |    2 +-
 lib/rspec/mocks/example_methods.rb                 |   42 ++-
 lib/rspec/mocks/extensions/marshal.rb              |   20 +-
 lib/rspec/mocks/extensions/psych.rb                |   23 --
 lib/rspec/mocks/framework.rb                       |   20 +-
 lib/rspec/mocks/instance_method_stasher.rb         |    3 +
 lib/rspec/mocks/matchers/have_received.rb          |   93 ++++++
 lib/rspec/mocks/matchers/receive.rb                |   96 ++++++
 lib/rspec/mocks/message_expectation.rb             |   84 +++--
 lib/rspec/mocks/method_double.rb                   |   96 +++---
 lib/rspec/mocks/methods.rb                         |  155 ---------
 lib/rspec/mocks/mutate_const.rb                    |   28 +-
 lib/rspec/mocks/proxy.rb                           |   65 ++--
 lib/rspec/mocks/proxy_for_nil.rb                   |   37 +++
 lib/rspec/mocks/serialization.rb                   |   34 --
 lib/rspec/mocks/space.rb                           |   75 ++++-
 lib/rspec/mocks/stub_chain.rb                      |   51 +++
 lib/rspec/mocks/syntax.rb                          |  349 ++++++++++++++++++++
 lib/rspec/mocks/targets.rb                         |   69 ++++
 lib/rspec/mocks/test_double.rb                     |   46 ++-
 lib/rspec/mocks/version.rb                         |    2 +-
 lib/spec/mocks.rb                                  |    4 +-
 metadata.yml                                       |  180 +++++-----
 spec/rspec/mocks/and_call_original_spec.rb         |    8 +
 spec/rspec/mocks/and_yield_spec.rb                 |   12 +-
 spec/rspec/mocks/any_instance_spec.rb              |  100 ++++--
 spec/rspec/mocks/any_number_of_times_spec.rb       |    6 +
 spec/rspec/mocks/argument_expectation_spec.rb      |   26 +-
 spec/rspec/mocks/at_least_spec.rb                  |   83 ++---
 spec/rspec/mocks/at_most_spec.rb                   |   24 +-
 spec/rspec/mocks/block_return_value_spec.rb        |   37 ++-
 spec/rspec/mocks/bug_report_10260_spec.rb          |    2 +-
 spec/rspec/mocks/bug_report_10263_spec.rb          |    2 +-
 spec/rspec/mocks/bug_report_11545_spec.rb          |    8 +-
 spec/rspec/mocks/bug_report_600_spec.rb            |    2 +-
 spec/rspec/mocks/bug_report_7611_spec.rb           |    2 +-
 .../combining_implementation_instructions_spec.rb  |    8 +
 spec/rspec/mocks/configuration_spec.rb             |  124 +++++++
 spec/rspec/mocks/double_spec.rb                    |   14 +-
 spec/rspec/mocks/extensions/marshal_spec.rb        |   54 +++
 spec/rspec/mocks/failing_argument_matchers_spec.rb |   18 +-
 spec/rspec/mocks/hash_excluding_matcher_spec.rb    |   26 +-
 spec/rspec/mocks/matchers/have_received_spec.rb    |  266 +++++++++++++++
 spec/rspec/mocks/matchers/receive_spec.rb          |  328 ++++++++++++++++++
 spec/rspec/mocks/methods_spec.rb                   |   27 ++
 spec/rspec/mocks/mock_ordering_spec.rb             |    8 +-
 spec/rspec/mocks/mock_space_spec.rb                |  133 +++++---
 spec/rspec/mocks/mock_spec.rb                      |  168 +++++++---
 spec/rspec/mocks/multiple_return_value_spec.rb     |   20 +-
 spec/rspec/mocks/mutate_const_spec.rb              |   22 +-
 spec/rspec/mocks/nil_expectation_warning_spec.rb   |   14 +-
 spec/rspec/mocks/null_object_mock_spec.rb          |   20 +-
 spec/rspec/mocks/once_counts_spec.rb               |   10 +-
 spec/rspec/mocks/options_hash_spec.rb              |    8 +-
 spec/rspec/mocks/partial_mock_spec.rb              |   37 ++-
 .../partial_mock_using_mocks_directly_spec.rb      |   14 +-
 spec/rspec/mocks/passing_argument_matchers_spec.rb |    4 +-
 spec/rspec/mocks/precise_counts_spec.rb            |   12 +-
 spec/rspec/mocks/serialization_spec.rb             |   23 +-
 spec/rspec/mocks/stash_spec.rb                     |   16 +-
 spec/rspec/mocks/stub_implementation_spec.rb       |    6 +-
 spec/rspec/mocks/stub_spec.rb                      |   77 +++--
 .../mocks/stubbed_message_expectations_spec.rb     |   12 +-
 .../mocks/syntax_agnostic_message_matchers_spec.rb |   81 +++++
 spec/rspec/mocks/test_double_spec.rb               |   22 +-
 spec/rspec/mocks/to_ary_spec.rb                    |   34 +-
 spec/rspec/mocks/twice_counts_spec.rb              |   12 +-
 spec/rspec/mocks_spec.rb                           |    4 +-
 spec/spec_helper.rb                                |   26 +-
 109 files changed, 3644 insertions(+), 1188 deletions(-)

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



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