[DRE-commits] [ruby-rspec-rails] 01/04: Merge tag 'upstream/3.2.1'
Cédric Boutillier
boutil at moszumanska.debian.org
Sat May 2 20:42:23 UTC 2015
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 6249f3b4727e801837188d350c8f415e3b0ecf50
Merge: e89fa56 9925e1e
Author: Cédric Boutillier <boutil at debian.org>
Date: Sat May 2 21:59:36 2015 +0200
Merge tag 'upstream/3.2.1'
Upstream version 3.2.1
# gpg: Signature faite le sam. 02 mai 2015 21:59:32 CEST avec la clef RSA d'identifiant 39CD217A
# gpg: Bonne signature de « Cédric Boutillier <boutil at debian.org> »
# gpg: alias « Cédric Boutillier <cedric.boutillier at upmc.fr> »
# gpg: alias « Cédric Boutillier <cedric.boutillier at polytechnique.org> »
# gpg: alias « Cédric Boutillier <cedric.boutillier at gmail.com> »
.gitignore | 7 +-
.rubocop.yml | 45 ++
.rubocop_rspec_base.yml | 130 ++++++
.travis.yml | 105 +++--
.yardopts | 2 +-
Capybara.md | 4 +-
Changelog.md | 282 ++++++++++--
DEV-README.md | 30 --
Gemfile | 43 +-
Gemfile-rails-dependencies | 27 ++
Gemfile-rspec-dependencies | 9 +
History.md | 1 -
License.txt | 1 +
README.md | 318 +++++++++-----
README_DEV.md | 56 +--
Rakefile | 154 +++++--
Upgrade.md | 1 -
appveyor.yml | 34 ++
example_app_generator/generate_app.rb | 37 ++
example_app_generator/generate_stuff.rb | 124 ++++++
.../no_active_record/app/models/in_memory/model.rb | 59 +++
.../generators/in_memory/model/model_generator.rb | 29 ++
.../in_memory/model/templates/model.rb.erb | 7 +
.../spec/verify_no_active_record_spec.rb | 7 +
example_app_generator/run_specs.rb | 9 +
.../spec/verify_active_record_spec.rb | 7 +
.../travis_retry_bundle_install.sh | 7 +
features/.nav | 8 +-
features/Autotest.md | 24 -
features/Generators.md | 2 +
features/README.md | 22 +-
features/RailsVersions.md | 4 +
features/Transactions.md | 2 +-
features/controller_specs/README.md | 37 +-
.../controller_specs/anonymous_controller.feature | 487 +++++++++++++--------
features/controller_specs/bypass_rescue.feature | 8 +-
features/controller_specs/controller_spec.feature | 12 +-
features/controller_specs/engine_routes.feature | 60 +--
.../controller_specs/isolation_from_views.feature | 16 +-
features/controller_specs/render_views.feature | 22 +-
features/directory_structure.feature | 193 ++++++++
features/feature_specs/feature_spec.feature | 60 ++-
features/helper_specs/helper_spec.feature | 48 +-
features/mailer_specs/url_helpers.feature | 11 +-
features/matchers/have_http_status_matcher.feature | 148 +++++++
features/matchers/new_record_matcher.feature | 4 +-
features/matchers/redirect_to_matcher.feature | 4 +-
features/matchers/relation_match_array.feature | 4 +-
features/matchers/render_template_matcher.feature | 10 +-
features/mocks/mock_model.feature | 147 -------
features/mocks/stub_model.feature | 58 ---
features/model_specs/README.md | 10 +-
features/model_specs/errors_on.feature | 51 ---
features/model_specs/records.feature | 27 --
.../model_specs/transactional_examples.feature | 18 +-
features/model_specs/verified_doubles.feature | 19 +
features/request_specs/request_spec.feature | 7 +-
features/routing_specs/README.md | 4 +-
features/routing_specs/be_routable_matcher.feature | 20 +-
features/routing_specs/engine_routes.feature | 40 +-
features/routing_specs/named_routes.feature | 4 +-
features/routing_specs/route_to_matcher.feature | 20 +-
features/step_definitions/model_steps.rb | 3 -
features/support/capybara.rb | 10 +
features/support/env.rb | 53 +--
features/upgrade/README.md | 178 ++++++++
features/{Upgrade.md => upgrade/from_1x_to_2x.md} | 2 +-
.../view_specs/inferred_controller_path.feature | 14 +-
features/view_specs/stub_template.feature | 14 +-
features/view_specs/view_spec.feature | 64 +--
lib/autotest/rails_rspec2.rb | 85 ----
lib/generators/rspec.rb | 25 +-
.../rspec/controller/controller_generator.rb | 1 +
.../rspec/controller/templates/controller_spec.rb | 10 +-
.../rspec/controller/templates/view_spec.rb | 4 +-
lib/generators/rspec/feature/feature_generator.rb | 16 +
.../rspec/feature/templates/feature_spec.rb | 5 +
lib/generators/rspec/helper/helper_generator.rb | 1 +
.../rspec/helper/templates/helper_spec.rb | 4 +-
lib/generators/rspec/install/install_generator.rb | 49 ++-
lib/generators/rspec/install/templates/.rspec | 1 -
.../rspec/install/templates/spec/rails_helper.rb | 59 +++
.../rspec/install/templates/spec/spec_helper.rb.tt | 49 ---
.../rspec/integration/integration_generator.rb | 12 +-
.../rspec/integration/templates/request_spec.rb | 11 +-
lib/generators/rspec/job/job_generator.rb | 12 +
.../templates/job_spec.rb.erb} | 4 +-
lib/generators/rspec/mailer/mailer_generator.rb | 7 +
.../rspec/mailer/templates/mailer_spec.rb | 12 +-
lib/generators/rspec/mailer/templates/preview.rb | 13 +
lib/generators/rspec/model/model_generator.rb | 24 +-
lib/generators/rspec/model/templates/fixtures.yml | 2 +-
lib/generators/rspec/model/templates/model_spec.rb | 4 +-
.../rspec/observer/observer_generator.rb | 1 +
.../rspec/observer/templates/observer_spec.rb | 4 +-
.../rspec/scaffold/scaffold_generator.rb | 242 +++++-----
.../rspec/scaffold/templates/controller_spec.rb | 95 ++--
.../rspec/scaffold/templates/edit_spec.rb | 18 +-
.../rspec/scaffold/templates/index_spec.rb | 13 +-
.../rspec/scaffold/templates/new_spec.rb | 20 +-
.../rspec/scaffold/templates/routing_spec.rb | 18 +-
.../rspec/scaffold/templates/show_spec.rb | 15 +-
lib/generators/rspec/view/templates/view_spec.rb | 4 +-
lib/generators/rspec/view/view_generator.rb | 1 +
lib/rspec-rails.rb | 38 +-
lib/rspec/rails.rb | 18 +-
lib/rspec/rails/active_record.rb | 21 +
lib/rspec/rails/adapters.rb | 109 +++--
lib/rspec/rails/configuration.rb | 97 ++++
lib/rspec/rails/example.rb | 33 --
.../rails/example/controller_example_group.rb | 314 +++++++------
lib/rspec/rails/example/feature_example_group.rb | 82 +++-
lib/rspec/rails/example/helper_example_group.rb | 53 +--
lib/rspec/rails/example/mailer_example_group.rb | 43 +-
lib/rspec/rails/example/model_example_group.rb | 14 +-
lib/rspec/rails/example/rails_example_group.rb | 1 +
lib/rspec/rails/example/request_example_group.rb | 36 +-
lib/rspec/rails/example/routing_example_group.rb | 79 ++--
lib/rspec/rails/example/view_example_group.rb | 277 ++++++------
lib/rspec/rails/extensions.rb | 1 -
lib/rspec/rails/extensions/active_record/base.rb | 58 ---
lib/rspec/rails/extensions/active_record/proxy.rb | 1 -
lib/rspec/rails/feature_check.rb | 55 +++
lib/rspec/rails/fixture_support.rb | 17 +-
lib/rspec/rails/matchers.rb | 20 +-
lib/rspec/rails/matchers/be_a_new.rb | 129 +++---
lib/rspec/rails/matchers/be_new_record.rb | 44 +-
lib/rspec/rails/matchers/be_valid.rb | 74 ++--
lib/rspec/rails/matchers/have_extension.rb | 36 --
lib/rspec/rails/matchers/have_http_status.rb | 361 +++++++++++++++
lib/rspec/rails/matchers/have_rendered.rb | 66 +--
lib/rspec/rails/matchers/redirect_to.rb | 59 +--
lib/rspec/rails/matchers/relation_match_array.rb | 2 +-
lib/rspec/rails/matchers/routing_matchers.rb | 200 +++++----
lib/rspec/rails/mocks.rb | 274 ------------
lib/rspec/rails/module_inclusion.rb | 19 -
lib/rspec/rails/tasks/rspec.rake | 2 +-
lib/rspec/rails/vendor/capybara.rb | 8 +-
lib/rspec/rails/vendor/webrat.rb | 33 --
lib/rspec/rails/version.rb | 4 +-
lib/rspec/rails/view_assigns.rb | 36 +-
lib/rspec/rails/view_rendering.rb | 65 +--
maintenance-branch | 1 +
rspec-rails.gemspec | 25 +-
script/after_update_travis_build.sh | 5 +
script/before_update_travis_build.sh | 5 +
script/clone_all_rspec_repos | 24 +
script/custom_build_functions.sh | 12 +
script/functions.sh | 130 ++++++
script/predicate_functions.sh | 64 +++
script/run_build | 28 ++
script/travis_functions.sh | 69 +++
spec/autotest/rails_rspec2_spec.rb | 36 --
.../rspec/controller/controller_generator_spec.rb | 34 +-
.../rspec/feature/feature_generator_spec.rb | 43 ++
.../rspec/helper/helper_generator_spec.rb | 10 +-
.../rspec/install/install_generator_spec.rb | 107 ++++-
.../integration/integration_generator_spec.rb | 31 +-
spec/generators/rspec/job/job_generator_spec.rb | 22 +
.../rspec/mailer/mailer_generator_spec.rb | 36 +-
.../generators/rspec/model/model_generator_spec.rb | 18 +-
.../rspec/observer/observer_generator_spec.rb | 8 +-
.../rspec/scaffold/scaffold_generator_spec.rb | 92 ++--
spec/generators/rspec/view/view_generator_spec.rb | 14 +-
spec/rspec/rails/assertion_adapter_spec.rb | 6 +-
spec/rspec/rails/configuration_spec.rb | 4 +-
spec/rspec/rails/deprecations_spec.rb | 18 -
.../rails/example/controller_example_group_spec.rb | 167 +++++--
.../rails/example/feature_example_group_spec.rb | 18 +-
.../rails/example/helper_example_group_spec.rb | 33 +-
.../rails/example/mailer_example_group_spec.rb | 19 +-
.../rails/example/model_example_group_spec.rb | 11 +-
.../rails/example/request_example_group_spec.rb | 15 +-
.../rails/example/routing_example_group_spec.rb | 15 +-
.../rspec/rails/example/view_example_group_spec.rb | 75 ++--
.../extensions/active_model/errors_on_spec.rb | 23 -
.../rails/extensions/active_record/base_spec.rb | 42 --
spec/rspec/rails/fixture_support_spec.rb | 6 +-
spec/rspec/rails/matchers/be_a_new_spec.rb | 34 +-
spec/rspec/rails/matchers/be_new_record_spec.rb | 4 +-
spec/rspec/rails/matchers/be_routable_spec.rb | 20 +-
spec/rspec/rails/matchers/be_valid_spec.rb | 36 +-
spec/rspec/rails/matchers/errors_on_spec.rb | 38 --
spec/rspec/rails/matchers/has_spec.rb | 2 +-
spec/rspec/rails/matchers/have_http_status_spec.rb | 434 ++++++++++++++++++
spec/rspec/rails/matchers/have_rendered_spec.rb | 6 +-
spec/rspec/rails/matchers/redirect_to_spec.rb | 12 +-
.../rails/matchers/relation_match_array_spec.rb | 12 +-
spec/rspec/rails/matchers/route_to_spec.rb | 55 ++-
.../rspec/rails/minitest_lifecycle_adapter_spec.rb | 2 +-
spec/rspec/rails/mocks/mock_model_spec.rb | 428 ------------------
spec/rspec/rails/mocks/stub_model_spec.rb | 154 -------
.../rspec/rails/setup_and_teardown_adapter_spec.rb | 8 +-
spec/rspec/rails/view_rendering_spec.rb | 42 +-
spec/sanity_check_spec.rb | 47 ++
spec/spec_helper.rb | 15 +-
spec/support/helpers.rb | 28 +-
spec/support/matchers.rb | 9 -
spec/support/shared_examples.rb | 99 +++++
templates/generate_stuff.rb | 18 -
templates/run_specs.rb | 9 -
201 files changed, 5908 insertions(+), 3974 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