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

[Jonas Genannt]

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

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

commit 0e4ccd9b00bc2395faa1126ce5f55d4957e16339
Merge: 5e18a51 0bb5806
Author: Jonas Genannt <jonas at brachium-system.net>
Date:   Wed Aug 19 14:17:57 2015 +0200

    Merge tag 'upstream/1.3.3'
    
    Upstream version 1.3.3
    
    # gpg: Signature made Wed 19 Aug 2015 02:17:57 PM CEST using RSA key ID 016CFFD0
    # gpg: Good signature from "Jonas Genannt <jonas at brachium-system.net>"
    # gpg:                 aka "Jonas Genannt <jonas.genannt at capi2name.de>"
    # gpg:                 aka "Jonas Genannt <genannt at debian.org>"
    
    * tag 'upstream/1.3.3':
      Imported Upstream version 1.3.3

 Gemfile.lock                                       |   18 +-
 Rakefile                                           |    4 +-
 TAGS                                               | 1056 --------------------
 checksums.yaml.gz                                  |  Bin 0 -> 268 bytes
 lib/flexmock.rb                                    |    2 +-
 lib/flexmock/argument_matchers.rb                  |    2 +-
 lib/flexmock/argument_types.rb                     |    3 +-
 lib/flexmock/base.rb                               |    3 +-
 lib/flexmock/call_record.rb                        |   30 +
 lib/flexmock/call_validator.rb                     |   68 ++
 lib/flexmock/composite.rb                          |   10 -
 lib/flexmock/composite_expectation.rb              |   56 ++
 lib/flexmock/core.rb                               |   94 +-
 lib/flexmock/core_class_methods.rb                 |    2 +-
 lib/flexmock/default_framework_adapter.rb          |    2 +-
 lib/flexmock/deprecated_methods.rb                 |   11 +-
 lib/flexmock/errors.rb                             |    2 +-
 lib/flexmock/expectation.rb                        |   91 +-
 lib/flexmock/expectation_builder.rb                |  133 +++
 lib/flexmock/expectation_director.rb               |   10 +-
 lib/flexmock/expectation_recorder.rb               |   42 +
 lib/flexmock/extensions/active_record_model.rb     |  109 ++
 lib/flexmock/mock_builder.rb                       |  139 +++
 lib/flexmock/mock_container.rb                     |  227 +----
 lib/flexmock/noop.rb                               |    2 +-
 lib/flexmock/ordering.rb                           |    3 +-
 lib/flexmock/partial_mock.rb                       |  152 +--
 lib/flexmock/rails.rb                              |    2 +-
 lib/flexmock/rails/view_mocking.rb                 |  144 ---
 lib/flexmock/recorder.rb                           |    7 +-
 lib/flexmock/rspec.rb                              |    2 +-
 lib/flexmock/rspec_spy_matcher.rb                  |    4 +
 lib/flexmock/spy_describers.rb                     |   27 +-
 lib/flexmock/test_unit.rb                          |   42 +-
 lib/flexmock/test_unit_integration.rb              |    8 +-
 ...st_unit.rb => test_unit_testcase_extensions.rb} |    4 +-
 lib/flexmock/undefined.rb                          |    2 +-
 lib/flexmock/validators.rb                         |   30 +-
 lib/flexmock/version.rb                            |    2 +-
 metadata.yml                                       |  104 +-
 test/based_partials_test.rb                        |    2 +-
 test/container_methods_test.rb                     |    2 +-
 test/default_framework_adapter_test.rb             |    2 +-
 test/demeter_mocking_test.rb                       |   54 +-
 test/deprecated_methods_test.rb                    |    2 +-
 test/examples_from_readme_test.rb                  |    2 +-
 test/expectation_description_test.rb               |    2 +-
 test/extended_should_receive_test.rb               |    2 +-
 test/mock_builder_test.rb                          |   68 ++
 test/naming_test.rb                                |    2 +-
 test/new_instances_test.rb                         |    2 +-
 test/partial_mock_test.rb                          |   29 +-
 test/rails_view_stub_test.rb                       |  145 ---
 test/record_mode_test.rb                           |    2 +-
 test/rspec_integration/integration_spec.rb         |    2 +-
 test/samples_test.rb                               |    3 +-
 test/should_ignore_missing_test.rb                 |    2 +-
 test/should_receive_test.rb                        |    2 +-
 test/test_setup.rb                                 |   17 +
 test/test_unit_integration/auto_test_unit_test.rb  |    2 +-
 test/tu_integration_test.rb                        |    2 +-
 test/undefined_test.rb                             |    2 +-
 62 files changed, 1046 insertions(+), 1951 deletions(-)

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