Merge pull request rails#54201 from zzak/fix-44867

Flash.add_flash_types should define helpers as private

Author: byroot

actionpack/lib/action_controller/metal/flash.rb

@@ -38,15 +38,12 @@ def add_flash_types(*types)
           define_method(type) do
             request.flash[type]
           end
+          private type
           helper_method(type) if respond_to?(:helper_method)
 
           self._flash_types += [type]
         end
       end
-
-      def action_methods # :nodoc:
-        @action_methods ||= super - _flash_types.map(&:to_s).to_set
-      end
     end
 
     private

actionpack/test/controller/flash_test.rb

@@ -274,7 +274,7 @@ def use_flash
 
     def set_bar
       flash[:bar] = "for great justice"
-      head :ok
+      render inline: "<%= bar %>"
     end
 
     def set_flash_optionally
@@ -330,7 +330,7 @@ def test_added_flash_types_method
     with_test_route_set do
       get "/set_bar"
       assert_response :success
-      assert_equal "for great justice", @controller.bar
+      assert_equal "for great justice", response.body
     end
   end
 
@@ -356,7 +356,7 @@ def test_flash_factored_into_etag
     end
   end
 
-  def test_flash_usable_in_metal_without_helper
+  def test_flash_unusable_in_metal_without_helper
     controller_class = nil
 
     assert_nothing_raised do
@@ -367,8 +367,11 @@ def test_flash_usable_in_metal_without_helper
 
     controller = controller_class.new
 
-    assert_respond_to controller, :alert
-    assert_respond_to controller, :notice
+    assert_not_respond_to controller, :alert
+    assert_not_respond_to controller, :notice
+
+    assert_includes controller.private_methods, :alert
+    assert_includes controller.private_methods, :notice
   end
 
   private

actionpack/test/controller/helper_test.rb

@@ -37,7 +37,7 @@ class JustMeController < ActionController::Base
   clear_helpers
 
   def flash
-    render inline: "<h1><%= notice %></h1>"
+    render inline: "<h1><%= request.flash[:notice] %></h1>"
   end
 
   def lib