[DRE-commits] [ruby-rspec-rails] 03/08: Merge tag 'upstream/3.3.3'

[Antonio Terceiro]

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

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

commit f56faa670671ecb2cb8d35afef8c5d901dcc0e12
Merge: b0a169f 2420f52
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Tue Nov 3 14:42:23 2015 -0200

    Merge tag 'upstream/3.3.3'
    
    Upstream version 3.3.3
    
    # gpg: Signature made Ter 03 Nov 2015 14:42:20 BRST using RSA key ID CD460BDE
    # gpg: Good signature from "Antonio Terceiro <terceiro at softwarelivre.org>"
    # gpg:                 aka "Antonio Terceiro <terceiro at dcc.ufba.br>"
    # gpg:                 aka "Antonio Terceiro <terceiro at colivre.coop.br>"
    # gpg:                 aka "Antonio Terceiro <terceiro at debian.org>"

 .gitignore                                         |   1 +
 .rspec                                             |   3 +-
 .rubocop_rspec_base.yml                            |   2 +-
 .travis.yml                                        |   4 -
 .yardopts                                          |   2 +
 Changelog.md                                       |  65 ++++++
 Gemfile                                            |   3 +-
 README.md                                          |   2 +-
 Rakefile                                           |   4 +-
 appveyor.yml                                       |   7 +-
 benchmarks/before_block_capture_block_vs_yield.rb  | 187 ++++++++++++++++
 .../generate_action_mailer_specs.rb                |  46 ++++
 example_app_generator/generate_stuff.rb            |  64 +++---
 example_app_generator/run_specs.rb                 |   4 +
 .../spec/__verify_fixture_load_order_spec.rb       |   7 +
 .../spec/features/model_mocks_integration_spec.rb  |  15 ++
 .../spec/support/default_preview_path              |  65 ++++++
 .../spec/verify_mailer_preview_path_spec.rb        | 241 +++++++++++++++++++++
 features/support/rubinius.rb                       |   2 +-
 .../rspec/install/templates/spec/rails_helper.rb   |   4 +-
 .../rspec/integration/integration_generator.rb     |   7 +-
 lib/generators/rspec/job/templates/job_spec.rb.erb |   0
 lib/generators/rspec/model/templates/model_spec.rb |   0
 lib/generators/rspec/request/request_generator.rb  |  10 +
 .../rspec/scaffold/templates/routing_spec.rb       |   8 +-
 lib/rspec-rails.rb                                 |  62 ++++--
 lib/rspec/rails/active_record.rb                   |   6 +-
 lib/rspec/rails/adapters.rb                        |  18 +-
 lib/rspec/rails/configuration.rb                   |  46 ++--
 lib/rspec/rails/example.rb                         |   1 +
 .../rails/example/controller_example_group.rb      |  19 +-
 lib/rspec/rails/example/job_example_group.rb       |  22 ++
 lib/rspec/rails/example/rails_example_group.rb     |   1 +
 lib/rspec/rails/example/routing_example_group.rb   |  13 +-
 lib/rspec/rails/example/view_example_group.rb      |   2 +-
 lib/rspec/rails/feature_check.rb                   |   6 +
 lib/rspec/rails/version.rb                         |   2 +-
 lib/rspec/rails/view_rendering.rb                  |   8 +-
 maintenance-branch                                 |   2 +-
 rspec-rails.gemspec                                |   6 +-
 script/clone_all_rspec_repos                       |   2 +-
 script/functions.sh                                |   5 +-
 script/predicate_functions.sh                      |   2 +-
 script/run_build                                   |   2 +-
 script/travis_functions.sh                         |   2 +-
 .../rspec/controller/controller_generator_spec.rb  |  10 +-
 .../rspec/feature/feature_generator_spec.rb        |  10 +-
 .../rspec/helper/helper_generator_spec.rb          |  10 +-
 .../rspec/install/install_generator_spec.rb        |   7 +-
 .../integration/integration_generator_spec.rb      |  33 +--
 spec/generators/rspec/job/job_generator_spec.rb    |   8 +-
 .../rspec/mailer/mailer_generator_spec.rb          |  10 +-
 .../generators/rspec/model/model_generator_spec.rb |  10 +-
 .../rspec/observer/observer_generator_spec.rb      |  10 +-
 .../rspec/request/request_generator_spec.rb        |   8 +
 .../rspec/scaffold/scaffold_generator_spec.rb      |  10 +-
 spec/generators/rspec/view/view_generator_spec.rb  |  10 +-
 spec/rspec/rails/active_model_spec.rb              |  41 ++++
 spec/rspec/rails/active_record_spec.rb             |  42 ++++
 spec/rspec/rails/configuration_spec.rb             | 231 +++++++++++++++++++-
 spec/rspec/rails/example/job_example_group_spec.rb |  10 +
 .../rspec/rails/example/view_example_group_spec.rb |   9 +
 spec/support/generators.rb                         |  73 +++++++
 63 files changed, 1309 insertions(+), 213 deletions(-)

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