Skip to content

Commit 2dec02a

Browse files
authored
Merge pull request rails#53159 from kamipo/detailed_message
Remove `error.respond_to?(:detailed_message)` conditions
2 parents 6df3358 + 795fb4a commit 2dec02a

File tree

8 files changed

+17
-76
lines changed

8 files changed

+17
-76
lines changed

actionpack/test/controller/base_test.rb

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -190,11 +190,7 @@ def test_exceptions_have_suggestions_for_fix
190190
exception = assert_raise AbstractController::ActionNotFound do
191191
get :ello
192192
end
193-
if exception.respond_to?(:detailed_message)
194-
assert_match "Did you mean?", exception.detailed_message
195-
else
196-
assert_match "Did you mean?", exception.message
197-
end
193+
assert_match "Did you mean?", exception.detailed_message
198194
end
199195

200196
def test_action_missing_should_work

actionpack/test/controller/helper_test.rb

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,7 @@ class HelpersTypoControllerTest < ActiveSupport::TestCase
8888
def test_helper_typo_error_message
8989
e = assert_raise(NameError) { HelpersTypoController.helper "admin/users" }
9090
assert_includes e.message, "uninitialized constant Admin::UsersHelper"
91-
if e.respond_to?(:detailed_message)
92-
assert_includes e.detailed_message, "Did you mean? Admin::UsersHelpeR"
93-
else
94-
assert_includes e.message, "Did you mean? Admin::UsersHelpeR"
95-
end
91+
assert_includes e.detailed_message, "Did you mean? Admin::UsersHelpeR"
9692
end
9793
end
9894

actionpack/test/controller/required_params_test.rb

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,20 +26,12 @@ class ActionControllerRequiredParamsTest < ActionController::TestCase
2626
error = assert_raise ActionController::ParameterMissing do
2727
post :create, params: { boko: { name: "Mjallo!" } }
2828
end
29-
if error.respond_to?(:detailed_message)
30-
assert_match "Did you mean?", error.detailed_message
31-
else
32-
assert_match "Did you mean?", error.message
33-
end
29+
assert_match "Did you mean?", error.detailed_message
3430

3531
error = assert_raise ActionController::ParameterMissing do
3632
post :create, params: { book: { naem: "Mjallo!" } }
3733
end
38-
if error.respond_to?(:detailed_message)
39-
assert_match "Did you mean?", error.detailed_message
40-
else
41-
assert_match "Did you mean?", error.message
42-
end
34+
assert_match "Did you mean?", error.detailed_message
4335
end
4436

4537
test "required parameters that are present will not raise" do

actionpack/test/dispatch/routing_test.rb

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4968,11 +4968,7 @@ def app; APP end
49684968

49694969
test "exceptions have suggestions for fix" do
49704970
error = assert_raises(ActionController::UrlGenerationError) { product_path(nil, "id" => "url-tested") }
4971-
if error.respond_to?(:detailed_message)
4972-
assert_match "Did you mean?", error.detailed_message
4973-
else
4974-
assert_match "Did you mean?", error.message
4975-
end
4971+
assert_match "Did you mean?", error.detailed_message
49764972
end
49774973

49784974
# FIXME: we should fix all locations that raise this exception to provide

actionview/test/template/render_test.rb

Lines changed: 8 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -706,55 +706,32 @@ def test_render_partial_with_layout_raises_descriptive_error
706706

707707
def test_render_partial_provides_spellcheck
708708
e = assert_raises(ActionView::MissingTemplate) { @view.render(partial: "test/partail") }
709-
if e.respond_to?(:detailed_message)
710-
assert_match %r{Did you mean\? test/partial\e\[m\n\e\[1m *test/partialhtml}, e.detailed_message
711-
else
712-
assert_match %r{Did you mean\? test/partial\n *test/partialhtml}, e.message
713-
end
709+
assert_match %r{Did you mean\? test/partial\e\[m\n\e\[1m *test/partialhtml}, e.detailed_message
714710
end
715711

716712
def test_spellcheck_doesnt_list_directories
717713
e = assert_raises(ActionView::MissingTemplate) { @view.render(partial: "test/directory") }
718-
if e.respond_to?(:detailed_message)
719-
assert_match %r{Did you mean\?}, e.detailed_message
720-
assert_no_match %r{Did you mean\? test/directory\n}, e.detailed_message # test/hello is a directory
721-
else
722-
assert_match %r{Did you mean\?}, e.message
723-
assert_no_match %r{Did you mean\? test/directory\n}, e.message # test/hello is a directory
724-
end
714+
assert_match %r{Did you mean\?}, e.detailed_message
715+
assert_no_match %r{Did you mean\? test/directory\n}, e.detailed_message # test/hello is a directory
725716
end
726717

727718
def test_spellcheck_only_lists_templates
728719
e = assert_raises(ActionView::MissingTemplate) { @view.render(template: "test/partial") }
729720

730-
if e.respond_to?(:detailed_message)
731-
assert_match %r{Did you mean\?}, e.detailed_message
732-
assert_no_match %r{Did you mean\? test/partial\n}, e.detailed_message
733-
else
734-
assert_match %r{Did you mean\?}, e.message
735-
assert_no_match %r{Did you mean\? test/partial\n}, e.message
736-
end
721+
assert_match %r{Did you mean\?}, e.detailed_message
722+
assert_no_match %r{Did you mean\? test/partial\n}, e.detailed_message
737723
end
738724

739725
def test_spellcheck_only_lists_partials
740726
e = assert_raises(ActionView::MissingTemplate) { @view.render(partial: "test/template") }
741727

742-
if e.respond_to?(:detailed_message)
743-
assert_match %r{Did you mean\?}, e.detailed_message
744-
assert_no_match %r{Did you mean\? test/template\n}, e.detailed_message
745-
else
746-
assert_match %r{Did you mean\?}, e.message
747-
assert_no_match %r{Did you mean\? test/template\n}, e.message
748-
end
728+
assert_match %r{Did you mean\?}, e.detailed_message
729+
assert_no_match %r{Did you mean\? test/template\n}, e.detailed_message
749730
end
750731

751732
def test_render_partial_wrong_details_no_spellcheck
752733
e = assert_raises(ActionView::MissingTemplate) { @view.render(partial: "test/partial_with_only_html_version", formats: [:xml]) }
753-
if e.respond_to?(:detailed_message)
754-
assert_no_match %r{Did you mean\?}, e.detailed_message
755-
else
756-
assert_no_match %r{Did you mean\?}, e.message
757-
end
734+
assert_no_match %r{Did you mean\?}, e.detailed_message
758735
end
759736

760737
def test_render_with_nested_layout

activerecord/test/cases/associations/eager_test.rb

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -881,11 +881,7 @@ def test_eager_with_invalid_association_reference
881881
error = assert_raise(ActiveRecord::AssociationNotFoundError) {
882882
Post.all.merge!(includes: :taggingz).find(6)
883883
}
884-
if error.respond_to?(:detailed_message)
885-
assert_match "Did you mean? tagging", error.detailed_message
886-
else
887-
assert_match "Did you mean? tagging\n", error.message
888-
end
884+
assert_match "Did you mean? tagging", error.detailed_message
889885
end
890886

891887
def test_eager_has_many_through_with_order

activerecord/test/cases/associations/inverse_associations_test.rb

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -418,11 +418,7 @@ def test_trying_to_use_inverses_that_dont_exist_should_have_suggestions_for_fix
418418
Human.first.confused_face
419419
}
420420

421-
if error.respond_to?(:detailed_message)
422-
assert_match "Did you mean?", error.detailed_message
423-
else
424-
assert_match "Did you mean?", error.message
425-
end
421+
assert_match "Did you mean?", error.detailed_message
426422
assert_equal "confused_human", error.corrections.first
427423
end
428424
end
@@ -912,11 +908,7 @@ def test_trying_to_use_inverses_that_dont_exist_should_have_suggestions_for_fix
912908
Face.first.confused_human
913909
}
914910

915-
if error.respond_to?(:detailed_message)
916-
assert_match "Did you mean?", error.detailed_message
917-
else
918-
assert_match "Did you mean?", error.message
919-
end
911+
assert_match "Did you mean?", error.detailed_message
920912
assert_equal "confused_face", error.corrections.first
921913
end
922914

activerecord/test/cases/associations/join_model_test.rb

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -345,11 +345,7 @@ def test_exceptions_have_suggestions_for_fix
345345
error = assert_raise(ActiveRecord::HasManyThroughAssociationNotFoundError) {
346346
authors(:david).nothings
347347
}
348-
if error.respond_to?(:detailed_message)
349-
assert_match "Did you mean?", error.detailed_message
350-
else
351-
assert_match "Did you mean?", error.message
352-
end
348+
assert_match "Did you mean?", error.detailed_message
353349
end
354350

355351
def test_has_many_through_join_model_with_conditions

0 commit comments

Comments
 (0)