diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2019-01-22 14:02:42 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-22 14:02:42 -0500 |
| commit | 1d359d4bf6775585b0a488678dac3d8b5ff9c634 (patch) | |
| tree | 1154cae85a79609d15f67ec647ee3812b3bda9c5 | |
| parent | db4b77aca147ec3c7376d803fc6ccb14c9195352 (diff) | |
| parent | 78cf58b7657a60d50046c044b8dad7b2800304f0 (diff) | |
| download | rails-1d359d4bf6775585b0a488678dac3d8b5ff9c634.tar.gz rails-1d359d4bf6775585b0a488678dac3d8b5ff9c634.tar.bz2 rails-1d359d4bf6775585b0a488678dac3d8b5ff9c634.zip | |
Merge pull request #35020 from alkesh26/ationpack-typo-fixes
Actionpack typo fixes.
| -rw-r--r-- | actionpack/CHANGELOG.md | 4 | ||||
| -rw-r--r-- | actionpack/test/dispatch/debug_exceptions_test.rb | 2 | ||||
| -rw-r--r-- | actionpack/test/journey/router_test.rb | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index 1a1b1034aa..c29257f83d 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -82,7 +82,7 @@ * Apply mapping to symbols returned from dynamic CSP sources Previously if a dynamic source returned a symbol such as :self it - would be converted to a string implicity, e.g: + would be converted to a string implicitly, e.g: policy.default_src -> { :self } @@ -135,7 +135,7 @@ *Assain Jaleel* -* Raises `ActionController::RespondToMismatchError` with confliciting `respond_to` invocations. +* Raises `ActionController::RespondToMismatchError` with conflicting `respond_to` invocations. `respond_to` can match multiple types and lead to undefined behavior when multiple invocations are made and the types do not match: diff --git a/actionpack/test/dispatch/debug_exceptions_test.rb b/actionpack/test/dispatch/debug_exceptions_test.rb index c326f276bf..aadc6be077 100644 --- a/actionpack/test/dispatch/debug_exceptions_test.rb +++ b/actionpack/test/dispatch/debug_exceptions_test.rb @@ -8,7 +8,7 @@ class DebugExceptionsTest < ActionDispatch::IntegrationTest class Boomer attr_accessor :closed - def initialize(detailed = false) + def initialize(detailed = false) @detailed = detailed @closed = false end diff --git a/actionpack/test/journey/router_test.rb b/actionpack/test/journey/router_test.rb index 1f4e14aef6..f8d89def6a 100644 --- a/actionpack/test/journey/router_test.rb +++ b/actionpack/test/journey/router_test.rb @@ -284,7 +284,7 @@ module ActionDispatch def test_generate_missing_keys_no_matches_different_format_keys get "/:controller/:action/:name", to: "foo#bar" - primarty_parameters = { + primary_parameters = { id: 1, controller: "tasks", action: "show", @@ -297,9 +297,9 @@ module ActionDispatch missing_parameters = { missing_key => "task_1" } - request_parameters = primarty_parameters.merge(redirection_parameters).merge(missing_parameters) + request_parameters = primary_parameters.merge(redirection_parameters).merge(missing_parameters) - message = "No route matches #{Hash[request_parameters.sort_by { |k, v|k.to_s }].inspect}, missing required keys: #{[missing_key.to_sym].inspect}" + message = "No route matches #{Hash[request_parameters.sort_by { |k, _|k.to_s }].inspect}, missing required keys: #{[missing_key.to_sym].inspect}" error = assert_raises(ActionController::UrlGenerationError) do @formatter.generate( |