Remove code duplication and improve message

rails · Jan 15, 2024 · a39332f · a39332f
1 parent 0821d25
commit a39332f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 15 deletions.
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -216,23 +216,21 @@ def normalize_options!(options, path_params, modyoule)
 
             if to.respond_to?(:action) || to.respond_to?(:call)
               options
-            elsif to.nil?
-              controller = default_controller
-              action = default_action
-
-              controller = add_controller_module(controller, modyoule)
-
-              options.merge! check_controller_and_action(path_params, controller, action)
-            elsif to.is_a?(String) && to.include?("#")
-              to_endpoint = to.split("#").map!(&:-@)
-              controller  = to_endpoint[0]
-              action      = to_endpoint[1]
+            else
+              if to.nil?
+                controller = default_controller
+                action = default_action
+              elsif to.is_a?(String) && to.include?("#")
+                to_endpoint = to.split("#").map!(&:-@)
+                controller  = to_endpoint[0]
+                action      = to_endpoint[1]
+              else
+                raise ArgumentError, ":to must respond to `action` or `call`, or it must be a String that includes '#'"
+              end
 
               controller = add_controller_module(controller, modyoule)
 
               options.merge! check_controller_and_action(path_params, controller, action)
-            else
-              raise ArgumentError, ":to must respond_to? :action or :call, or it must be a String that includes '#'"
             end
           end
 

diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb
@@ -4054,7 +4054,7 @@ def test_missing_controller_with_to
         get "/foo/bar", to: "foo"
       end
     }
-    assert_match(/:to must respond_to/, ex.message)
+    assert_match(/:to must respond to/, ex.message)
   end
 
   def test_to_is_a_symbol
@@ -4063,7 +4063,7 @@ def test_to_is_a_symbol
         get "/foo/bar", to: :foo
       end
     }
-    assert_match(/:to must respond_to/, ex.message)
+    assert_match(/:to must respond to/, ex.message)
   end
 
   def test_missing_action_on_hash