Skip to content

Fix some typos #2601

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 15 commits into from
May 25, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@

version: "{build}"

# This will build all PRs targetting matching branches.
# This will build all PRs targeting matching branches.
# Without this, each PR builds twice -- once for the PR branch HEAD,
# and once for the merge commit that github creates for each mergable PR.
# and once for the merge commit that github creates for each mergeable PR.
branches:
only:
- main
Expand Down
4 changes: 2 additions & 2 deletions benchmarks/before_block_capture_block_vs_yield.rb
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ def capture_block_and_call_n_times(n, &block)
> a high constant cost, taking about 5x longer than a single `yield`
> (even if the block is never used!).
>
> However, fowarding a captured block can be faster than using `yield`
> However, forwarding a captured block can be faster than using `yield`
> if the block is used many times (the breakeven point is at about 20-25
> invocations), so it appears that he per-invocation cost of `yield`
> is higher than that of a captured-and-forwarded block.
Expand All @@ -71,7 +71,7 @@ def capture_block_and_call_n_times(n, &block)
> Surprisingly, `flat_map(&block)` appears to be faster than
> `flat_map { yield }` in spite of the fact that our array here
> is smaller than the break-even point of 20-25 measured in the
> `capture_block_vs_yield.rb` benchmark. In fact, the forwaded-block
> `capture_block_vs_yield.rb` benchmark. In fact, the forwarded-block
> version remains faster in my benchmarks here no matter how small
> I shrink the `words` array. I'm not sure why!
>
Expand Down
2 changes: 1 addition & 1 deletion example_app_generator/spec/support/default_preview_path
Original file line number Diff line number Diff line change
Expand Up @@ -69,5 +69,5 @@ elsif defined?(::ActionMailer::Preview)
end

# This will force the loading of ActionMailer settings to ensure we do not
# accicentally set something we should not
# accidentally set something we should not
ActionMailer::Base.smtp_settings
2 changes: 1 addition & 1 deletion features/matchers/have_stream_from_matcher.feature
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Feature: have_stream_from matcher
The `have_stream_from` matcher is used to check if a channel has been subscribed to a given stream specified as a String.
If you use `stream_for` in you channel to subscribe to a model, use `have_stream_for` matcher instead.

The `have_no_streams` matcher is used to check if a channe hasn't been subscribed to any stream.
The `have_no_streams` matcher is used to check if a channel hasn't been subscribed to any stream.

It is available only in channel specs.

Expand Down
2 changes: 1 addition & 1 deletion lib/generators/rspec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
require 'rspec/rails/feature_check'

# @private
# Weirdly named generators namespace (should be `RSpec`) for compatability with
# Weirdly named generators namespace (should be `RSpec`) for compatibility with
# rails loading.
module Rspec
# @private
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
# Remove this line to enable support for ActiveRecord
config.use_active_record = false

# If you enable ActiveRecord support you should unncomment these lines,
# If you enable ActiveRecord support you should uncomment these lines,
# note if you'd prefer not to run each example within a transaction, you
# should set use_transactional_fixtures to false.
#
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ def pubsub_adapter
def check_channel_presence
return if @channel.present? && @channel.respond_to?(:channel_name)

error_msg = "Broadcasting channel can't be infered. Please, specify it with `from_channel`"
error_msg = "Broadcasting channel can't be inferred. Please, specify it with `from_channel`"
raise ArgumentError, error_msg
end
end
Expand Down
2 changes: 1 addition & 1 deletion lib/rspec/rails/matchers/have_enqueued_mail.rb
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ def mail_job_message(job)
end

# Ruby 3.1 changed how params were serialized on Rails 6.1
# so we override the active job implementation and customise it here.
# so we override the active job implementation and customize it here.
def deserialize_arguments(job)
args = super

Expand Down
2 changes: 1 addition & 1 deletion lib/rspec/rails/matchers/have_http_status.rb
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ def check_expected_status(test_response, expected)

private

# @return [String] formating the expected status and associated code(s)
# @return [String] formatting the expected status and associated code(s)
def type_message
@type_message ||= (expected == :error ? "an error" : "a #{expected}") +
" status code (#{type_codes})"
Expand Down
2 changes: 1 addition & 1 deletion spec/rspec/rails/configuration_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
end

describe "`#render_views=`" do
it "sets `render_views?` to the truthyness of the provided value" do
it "sets `render_views?` to the truthiness of the provided value" do
expect {
config.render_views = :a_value
}.to change { config.render_views? }.from(false).to(true)
Expand Down
4 changes: 2 additions & 2 deletions spec/rspec/rails/matchers/active_job_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ def self.name; "LoggingJob"; end
}
end

it "passess deserialized arguments to with block" do
it "passes deserialized arguments to with block" do
global_id_object = GlobalIdModel.new("42")

expect {
Expand Down Expand Up @@ -650,7 +650,7 @@ def self.name; "LoggingJob"; end
}
end

it "passess deserialized arguments to with block" do
it "passes deserialized arguments to with block" do
global_id_object = GlobalIdModel.new("42")

expect {
Expand Down
2 changes: 1 addition & 1 deletion spec/rspec/rails/matchers/have_enqueued_mail_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,7 @@ def self.name; "NonMailerJob"; end
)
end

it "passes when given a global id serialised argument" do
it "passes when given a global id serialized argument" do
expect {
UnifiedMailer.with(inquiry: GlobalIDArgument.new).test_email.deliver_later
}.to have_enqueued_email(UnifiedMailer, :test_email)
Expand Down
2 changes: 1 addition & 1 deletion spec/rspec/rails/view_rendering_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ def example.controller
end
end

it 'propogates to examples in nested groups properly' do
it 'propagates to examples in nested groups properly' do
value = :unset

group.class_exec do
Expand Down