[DRE-commits] [ruby-flexmock] 01/01: Merge tag 'upstream/2.0.4'

[Sebastien Badia]

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

sbadia-guest pushed a commit to branch master
in repository ruby-flexmock.

commit c597196cfa336d04f2c1688775472752d50b0171
Merge: 58e5e2a 65d4455
Author: Sebastien Badia <seb at sebian.fr>
Date:   Wed Mar 2 17:23:24 2016 -0300

    Merge tag 'upstream/2.0.4'
    
    Upstream version 2.0.4
    
    # gpg: Signature made Wed 02 Mar 2016 05:23:24 PM BRT
    # gpg:                using RSA key 0x8716CE4614A452D8
    # gpg: Good signature from "Sebastien Badia <seb at sebian.fr>"
    # gpg:                 aka "Sebastien Badia <seb at ldn-fai.net>"
    # gpg:                 aka "Sebastien Badia <sebastien at badia.fr>"
    # gpg:                 aka "Sebastien Badia <seb at gitoyen.net>"

 CHANGES                              |  6 +++-
 README.md                            | 12 ++------
 flexmock.gemspec                     |  1 +
 lib/flexmock/core.rb                 | 16 +++++++++--
 lib/flexmock/core_class_methods.rb   | 35 ++++++++++++++++++++++-
 lib/flexmock/expectation.rb          | 10 +++++--
 lib/flexmock/expectation_director.rb |  5 ++--
 lib/flexmock/minitest_integration.rb |  8 +++---
 lib/flexmock/ordering.rb             | 13 ++++++---
 lib/flexmock/partial_mock.rb         |  9 +-----
 lib/flexmock/rspec.rb                |  2 +-
 lib/flexmock/spy_describers.rb       | 16 +++--------
 lib/flexmock/version.rb              |  2 +-
 test/assert_spy_called_test.rb       |  2 +-
 test/base_class_test.rb              | 21 ++++++++++++++
 test/container_methods_test.rb       |  9 ++++++
 test/partial_mock_test.rb            | 30 ++++++++++++++++++++
 test/should_receive_test.rb          | 54 ++++++++++++++++++++++++++++++++++++
 test/test_helper.rb                  | 16 ++++++++++-
 19 files changed, 216 insertions(+), 51 deletions(-)

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