[DRE-commits] [ruby-rspec-rails] 01/10: Merge tag 'upstream/2.14.2'

[Caitlin Matos]

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

cm-guest pushed a commit to branch master
in repository ruby-rspec-rails.

commit 720f5e295a0b95e6ab442e3e37867ee71d66c5e5
Merge: e4a7356 4248b79
Author: Caitlin Matos <caitlin.matos at zoho.com>
Date:   Wed Aug 13 19:21:07 2014 -0400

    Merge tag 'upstream/2.14.2'
    
    Upstream version 2.14.2

 .gitignore                                         |  1 +
 .rspec                                             |  1 +
 .travis.yml                                        | 40 +++++++-------
 Changelog.md                                       | 49 +++++++++++++++++
 Gemfile                                            | 22 ++++++--
 README.md                                          |  6 +-
 Rakefile                                           |  2 +-
 Thorfile                                           | 11 ++--
 features/.nav                                      |  1 +
 features/Generators.md                             | 26 +++++++--
 features/matchers/relation_match_array.feature     |  7 ++-
 features/model_specs/errors_on.feature             |  2 +-
 features/model_specs/records.feature               | 27 +++++++++
 features/support/rubinius.rb                       |  6 ++
 lib/autotest/rails_rspec2.rb                       |  1 +
 .../rspec/helper/templates/helper_spec.rb          |  2 +-
 .../rspec/install/templates/spec/spec_helper.rb.tt |  7 ++-
 .../rspec/integration/integration_generator.rb     |  2 +-
 .../rspec/scaffold/scaffold_generator.rb           |  2 +-
 lib/rspec/rails.rb                                 |  4 +-
 lib/rspec/rails/adapters.rb                        | 64 ++++++++++++++++++----
 .../rails/example/controller_example_group.rb      | 11 ++--
 lib/rspec/rails/example/rails_example_group.rb     |  4 +-
 lib/rspec/rails/example/view_example_group.rb      |  5 +-
 lib/rspec/rails/extensions/active_record/base.rb   | 24 +++++---
 lib/rspec/rails/fixture_support.rb                 |  4 +-
 lib/rspec/rails/matchers/have_extension.rb         |  1 +
 lib/rspec/rails/matchers/routing_matchers.rb       |  4 ++
 lib/rspec/rails/mocks.rb                           | 51 +++++++++++++----
 lib/rspec/rails/module_inclusion.rb                | 12 +---
 lib/rspec/rails/tasks/rspec.rake                   | 26 ++++++---
 lib/rspec/rails/version.rb                         |  2 +-
 lib/rspec/rails/view_rendering.rb                  |  2 +-
 rspec-rails.gemspec                                |  7 ++-
 spec/rspec/rails/assertion_adapter_spec.rb         | 10 ++--
 spec/rspec/rails/assertion_delegator_spec.rb       |  2 +-
 .../rails/example/controller_example_group_spec.rb | 46 ++++++++++++----
 .../rspec/rails/example/view_example_group_spec.rb | 15 +++++
 .../rails/extensions/active_record/records_spec.rb |  9 ---
 spec/rspec/rails/matchers/be_valid_spec.rb         |  1 -
 spec/rspec/rails/matchers/redirect_to_spec.rb      |  1 +
 spec/rspec/rails/matchers/route_to_spec.rb         |  2 +-
 .../rspec/rails/minitest_lifecycle_adapter_spec.rb | 15 ++++-
 spec/rspec/rails/mocks/mock_model_spec.rb          | 53 +++++++++++++++++-
 spec/spec_helper.rb                                |  1 +
 spec/support/helpers.rb                            | 14 +++++
 46 files changed, 461 insertions(+), 144 deletions(-)

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