diff --git a/.rubocop.yml b/.rubocop.yml index bffff3303..a8347721b 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -29,7 +29,7 @@ Bundler/DuplicatedGem: Gemspec/RequiredRubyVersion: # Rubocop checks that the target ruby version matches the gemspec version - # but doesnt have a 2.2 option + # but doesn't have a 2.2 option Enabled: false Metrics/BlockLength: diff --git a/.rubocop_rspec_base.yml b/.rubocop_rspec_base.yml index 63294b1de..ba0e6c290 100644 --- a/.rubocop_rspec_base.yml +++ b/.rubocop_rspec_base.yml @@ -104,7 +104,7 @@ Style/SignalException: Layout/SpaceAroundEqualsInParameterDefault: EnforcedStyle: no_space -# We don't care about single vs double qoutes. +# We don't care about single vs double quotes. Style/StringLiterals: Enabled: false diff --git a/Changelog.md b/Changelog.md index 59a888e13..0f056f3e1 100644 --- a/Changelog.md +++ b/Changelog.md @@ -181,7 +181,7 @@ Enhancements: (Eloy Espinaco, Luka Lüdicke, #2355, #2356, #2378) * Generated scaffold now includes engine route helpers when inside a mountable engine. (Andrew W. Lee, #2372) -* Improve request spec "controller" scafold when no action is specified. +* Improve request spec "controller" scaffold when no action is specified. (Thomas Hareau, #2399) * Introduce testing snippets concept (Phil Pirozhkov, Benoit Tigeot, #2423) * Prevent collisions with `let(:name)` for Rails 6.1 and `let(:method_name)` on older @@ -584,7 +584,7 @@ Enhancements: * Add support for PATCH to route specs created via scaffold. (Igor Zubkov, #1336) * Improve controller and routing spec calls to `routes` by using `yield` instead of `call`. (Anton Davydov, #1308) -* Add support for `ActiveJob` specs as standard `RSpec::Rails::RailsExampleGoup`s +* Add support for `ActiveJob` specs as standard `RSpec::Rails::RailsExampleGroup`s via both `type: :job` and inferring type from spec directory `spec/jobs`. (Gabe Martin-Dempesy, #1361) * Include `RSpec::Rails::FixtureSupport` into example groups using metadata diff --git a/example_app_generator/spec/verify_view_path_stub_spec.rb b/example_app_generator/spec/verify_view_path_stub_spec.rb index 60a9d4110..985ccced0 100644 --- a/example_app_generator/spec/verify_view_path_stub_spec.rb +++ b/example_app_generator/spec/verify_view_path_stub_spec.rb @@ -1,6 +1,6 @@ require 'rails_helper' -RSpec.describe "verify view path doesnt leak stubs between examples", type: :view, order: :defined do +RSpec.describe "verify view path doesn't leak stubs between examples", type: :view, order: :defined do subject(:html) do render partial: "example" rendered diff --git a/features/directory_structure.feature b/features/directory_structure.feature index 62150cf67..f52d8b753 100644 --- a/features/directory_structure.feature +++ b/features/directory_structure.feature @@ -113,7 +113,7 @@ Feature: The directory structure lib ├── country_map.rb ├── development_mail_interceptor.rb - ├── enviroment_mail_interceptor.rb + ├── environment_mail_interceptor.rb └── tasks └── irc.rake spec diff --git a/lib/rspec/rails/example/mailbox_example_group.rb b/lib/rspec/rails/example/mailbox_example_group.rb index de85acdf4..2b6e43c1a 100644 --- a/lib/rspec/rails/example/mailbox_example_group.rb +++ b/lib/rspec/rails/example/mailbox_example_group.rb @@ -69,7 +69,7 @@ def have_failed # # @param message [Hash, Mail::Message] a mail message or hash of # attributes used to build one - # @return [ActionMaibox::InboundMessage] + # @return [ActionMailbox::InboundMessage] def process(message) MailboxExampleGroup.create_inbound_email(message).tap do |mail| self.class.mailbox_class.receive(mail) diff --git a/script/run_build b/script/run_build index f16a8f2bd..7d1aae56a 100755 --- a/script/run_build +++ b/script/run_build @@ -1,5 +1,5 @@ #!/bin/bash -# This file is manually managed unlike the rest of core rspec gems because it is independant. +# This file is manually managed unlike the rest of core rspec gems because it is independent. set -e source script/functions.sh diff --git a/script/run_rubocop b/script/run_rubocop index 2662c517c..b0e70d733 100755 --- a/script/run_rubocop +++ b/script/run_rubocop @@ -1,5 +1,5 @@ #!/bin/bash -# This file is manually managed unlike the rest of core rspec gems because it is independant. +# This file is manually managed unlike the rest of core rspec gems because it is independent. set -e source script/functions.sh diff --git a/script/update_rubygems_and_install_bundler b/script/update_rubygems_and_install_bundler index 921a3b786..c85e5dcc4 100755 --- a/script/update_rubygems_and_install_bundler +++ b/script/update_rubygems_and_install_bundler @@ -1,5 +1,5 @@ #!/bin/bash -# This file is manually managed unlike the rest of core rspec gems because it is independant. +# This file is manually managed unlike the rest of core rspec gems because it is independent. set -e