[DRE-commits] [ruby-rspec-rails] 01/06: Merge tag 'upstream/3.4.2'

[Cédric Boutillier]

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

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

commit d0c322241f8e24af7a368e5d05e8acc30c0b5936
Merge: b03e41e dfd2158
Author: Cédric Boutillier <boutil at debian.org>
Date:   Wed Mar 2 20:25:51 2016 +0100

    Merge tag 'upstream/3.4.2'
    
    Upstream version 3.4.2
    
    # gpg: Signature faite le mer. 02 mars 2016 20:25:50 CET
    # gpg:                avec la clef RSA 0x89AF82B739CD217A
    # gpg: Bonne signature de « Cédric Boutillier <boutil at debian.org> » [ultime]
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at upmc.fr> » [ultime]
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at polytechnique.org> » [ultime]
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at gmail.com> » [ultime]
    # Empreinte de clef principale : 3041 4D81 DC28 290C 2568  6DE3 DA49 58F6 11E1 49E9
    #    Empreinte de la sous-clef : 9CCD 6B31 9DBF 8E40 AB1A  BD1A 89AF 82B7 39CD 217A

 .document                                          |   2 +-
 .gitignore                                         |   1 +
 .rubocop_rspec_base.yml                            |   2 +-
 .travis.yml                                        |  14 ++
 .yardopts                                          |   2 +-
 BUILD_DETAIL.md                                    | 149 +++++++++++++++
 CODE_OF_CONDUCT.md                                 |  42 ++++
 CONTRIBUTING.md                                    |  25 +++
 Changelog.md                                       |  38 ++++
 DEVELOPMENT.md                                     | 132 +++++++++++++
 Gemfile                                            |   7 +
 License.txt => LICENSE.md                          |   8 +-
 README.md                                          |  32 +++-
 appveyor.yml                                       |   2 +-
 example_app_generator/generate_app.rb              |   9 +
 example_app_generator/generate_stuff.rb            |   4 +
 features/.nav                                      |   1 +
 features/GettingStarted.md                         |   2 +-
 features/Transactions.md                           |   4 +-
 features/backtrace_filtering.feature               |  45 +++++
 features/controller_specs/Cookies.md               |   7 +-
 .../controller_specs/anonymous_controller.feature  |  72 ++++++-
 features/controller_specs/controller_spec.feature  |  22 +++
 features/feature_specs/feature_spec.feature        |   3 +-
 .../matchers/have_enqueued_job_matcher.feature     |  74 ++++++++
 features/matchers/new_record_matcher.feature       |   2 +-
 features/request_specs/request_spec.feature        |  42 ++++
 features/step_definitions/additional_cli_steps.rb  |  13 ++
 features/support/env.rb                            |   7 +
 lib/generators/rspec.rb                            |   1 +
 .../rspec/install/templates/spec/rails_helper.rb   |   7 +-
 lib/rspec/rails/configuration.rb                   |  41 ++--
 .../rails/example/controller_example_group.rb      |   1 +
 lib/rspec/rails/example/feature_example_group.rb   |   1 +
 lib/rspec/rails/example/helper_example_group.rb    |   1 +
 lib/rspec/rails/example/job_example_group.rb       |   1 +
 lib/rspec/rails/example/mailer_example_group.rb    |   1 +
 lib/rspec/rails/example/model_example_group.rb     |   1 +
 lib/rspec/rails/example/rails_example_group.rb     |   1 +
 lib/rspec/rails/example/request_example_group.rb   |   1 +
 lib/rspec/rails/example/routing_example_group.rb   |   1 +
 lib/rspec/rails/example/view_example_group.rb      |   6 +-
 lib/rspec/rails/feature_check.rb                   |   1 -
 lib/rspec/rails/matchers.rb                        |   5 +
 lib/rspec/rails/matchers/active_job.rb             | 165 ++++++++++++++++
 lib/rspec/rails/matchers/be_a_new.rb               |   1 +
 lib/rspec/rails/matchers/be_new_record.rb          |   1 +
 lib/rspec/rails/matchers/be_valid.rb               |   1 +
 lib/rspec/rails/matchers/have_rendered.rb          |  23 ++-
 lib/rspec/rails/version.rb                         |   2 +-
 lib/rspec/rails/view_rendering.rb                  |  30 +--
 maintenance-branch                                 |   2 +-
 rspec-rails.gemspec                                |   2 +-
 script/clone_all_rspec_repos                       |   2 +-
 script/functions.sh                                |  79 +++++++-
 script/predicate_functions.sh                      |  14 +-
 script/run_build                                   |   5 +-
 script/travis_functions.sh                         |   6 +-
 .../rspec/install/install_generator_spec.rb        |  10 +
 spec/rspec/rails/configuration_spec.rb             |  22 ++-
 .../rspec/rails/example/view_example_group_spec.rb |   2 +-
 spec/rspec/rails/matchers/active_job_spec.rb       | 211 +++++++++++++++++++++
 spec/rspec/rails/matchers/have_rendered_spec.rb    |  21 ++
 spec/rspec/rails_spec.rb                           |  26 +++
 64 files changed, 1371 insertions(+), 87 deletions(-)

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