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

Cédric Boutillier boutil at moszumanska.debian.org
Thu Oct 6 21:33:33 UTC 2016


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 56794d08ff7fc2e064bc2a7d63891498697e16b7
Merge: ca5ab49 1bb9f9a
Author: Cédric Boutillier <boutil at debian.org>
Date:   Thu Oct 6 23:13:18 2016 +0200

    Merge tag 'upstream/3.5.2'
    
    Upstream version 3.5.2
    
    # gpg: Signature faite le jeu. 06 oct. 2016 23:13:17 CEST
    # 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

 .rubocop_rspec_base.yml                            |   6 +-
 .travis.yml                                        |  17 ++-
 BUILD_DETAIL.md                                    |   2 +-
 CODE_OF_CONDUCT.md                                 |  55 ++++---
 CONTRIBUTING.md                                    |   4 +-
 Changelog.md                                       |  92 +++++++++++-
 DEVELOPMENT.md                                     |   2 +-
 Gemfile                                            |  11 ++
 Gemfile-rails-dependencies                         |   5 +-
 README.md                                          |  36 ++++-
 Rakefile                                           |  47 +++---
 appveyor.yml                                       |   4 +-
 example_app_generator/app/views/foo.html           |   1 +
 .../app/views/some_templates/bar.html              |   1 +
 .../generate_action_mailer_specs.rb                |   3 +-
 example_app_generator/generate_app.rb              |  19 +++
 example_app_generator/generate_stuff.rb            |   5 +
 .../spec/support/default_preview_path              |   2 +-
 .../spec/verify_custom_renderers_spec.rb           | 159 +++++++++++++++++++++
 .../spec/verify_fixture_warning_spec.rb            |  64 +++++++++
 .../travis_retry_bundle_install.sh                 |   6 +-
 features/controller_specs/controller_spec.feature  |  23 ---
 features/controller_specs/render_views.feature     |  10 +-
 features/directory_structure.feature               |  13 +-
 features/file_fixture.feature                      |  38 +++++
 features/mailer_specs/README.md                    |  26 ++++
 features/mailer_specs/mailer_spec.feature          |  53 +++++++
 features/mailer_specs/url_helpers.feature          |  43 +++++-
 ....feature => have_been_enqueued_matcher.feature} |  26 ++--
 .../matchers/have_enqueued_job_matcher.feature     |  19 ++-
 features/matchers/render_template_matcher.feature  |   8 ++
 features/request_specs/request_spec.feature        |   4 +
 features/step_definitions/additional_cli_steps.rb  |   7 +
 features/view_specs/view_spec.feature              |  49 +++++--
 lib/generators/rspec/feature/feature_generator.rb  |  17 ++-
 .../feature/templates/feature_singular_spec.rb     |   5 +
 .../rspec/mailer/templates/mailer_spec.rb          |   4 +-
 lib/generators/rspec/mailer/templates/preview.rb   |   2 +-
 .../rspec/scaffold/scaffold_generator.rb           |   4 +-
 .../rspec/scaffold/templates/controller_spec.rb    |  64 +++++++++
 lib/rspec/rails.rb                                 |   1 +
 lib/rspec/rails/active_record.rb                   |   2 +-
 lib/rspec/rails/adapters.rb                        |  20 ++-
 lib/rspec/rails/configuration.rb                   |  36 ++++-
 lib/rspec/rails/example/helper_example_group.rb    |  11 +-
 lib/rspec/rails/example/request_example_group.rb   |   4 +
 lib/rspec/rails/example/view_example_group.rb      |  28 +++-
 lib/rspec/rails/feature_check.rb                   |   4 +
 lib/rspec/rails/file_fixture_support.rb            |  17 +++
 lib/rspec/rails/fixture_support.rb                 |  28 +++-
 lib/rspec/rails/matchers/active_job.rb             | 137 ++++++++++++++----
 lib/rspec/rails/matchers/have_http_status.rb       |   9 +-
 lib/rspec/rails/matchers/have_rendered.rb          |   4 +-
 lib/rspec/rails/matchers/routing_matchers.rb       |   2 +-
 lib/rspec/rails/vendor/capybara.rb                 |   6 +-
 lib/rspec/rails/version.rb                         |   2 +-
 lib/rspec/rails/view_path_builder.rb               |  29 ++++
 lib/rspec/rails/view_rendering.rb                  |  65 +++++++--
 lib/rspec/rails/view_spec_methods.rb               |  56 ++++++++
 maintenance-branch                                 |   2 +-
 rspec-rails.gemspec                                |  21 +--
 script/clone_all_rspec_repos                       |   2 +-
 script/functions.sh                                |  13 +-
 script/predicate_functions.sh                      |  14 +-
 script/run_build                                   |   2 +-
 script/travis_functions.sh                         |   2 +-
 .../rspec/feature/feature_generator_spec.rb        |  15 ++
 .../rspec/install/install_generator_spec.rb        |   6 +-
 .../rspec/mailer/mailer_generator_spec.rb          |   7 +-
 .../rspec/scaffold/scaffold_generator_spec.rb      |  16 +++
 spec/rspec/rails/assertion_adapter_spec.rb         |  12 ++
 spec/rspec/rails/configuration_spec.rb             |  16 ++-
 .../rails/example/controller_example_group_spec.rb |  18 +++
 .../rails/example/helper_example_group_spec.rb     |  31 +++-
 .../rails/example/mailer_example_group_spec.rb     |   1 +
 .../rspec/rails/example/view_example_group_spec.rb |  21 +++
 spec/rspec/rails/matchers/active_job_spec.rb       | 149 ++++++++++++++-----
 spec/rspec/rails/matchers/have_http_status_spec.rb |  21 +--
 spec/rspec/rails/matchers/have_rendered_spec.rb    |  19 ++-
 spec/rspec/rails/matchers/redirect_to_spec.rb      |   2 +-
 .../rspec/rails/setup_and_teardown_adapter_spec.rb |  17 +++
 spec/rspec/rails/view_rendering_spec.rb            |  29 ++++
 spec/rspec/rails/view_spec_methods_spec.rb         |  72 ++++++++++
 spec/spec_helper.rb                                |   4 -
 spec/support/ar_classes.rb                         |   2 +
 85 files changed, 1671 insertions(+), 260 deletions(-)

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



More information about the Pkg-ruby-extras-commits mailing list