Allow view helper's #initialize method to be called. [#5061 state:resolved]

2 files changed, 18 insertions, 1 deletions

diff --git a/actionpack/lib/action_view/test_case.rb b/actionpack/lib/action_view/test_case.rb
index e9d2e0b843..2c2661df26 100644
--- a/actionpack/lib/action_view/test_case.rb
+++ b/actionpack/lib/action_view/test_case.rb
@@ -74,6 +74,11 @@ module ActionView
           @helper_class ||= determine_default_helper_class(name)
         end
 
+        def new(*)
+          include_helper_modules!
+          super
+        end
+
       private
 
         def include_helper_modules!
@@ -89,7 +94,6 @@ module ActionView
         @output_buffer = ActiveSupport::SafeBuffer.new
         @rendered = ''
 
-        self.class.send(:include_helper_modules!)
         make_test_case_available_to_view!
         say_no_to_protect_against_forgery!
       end
diff --git a/actionpack/test/template/test_case_test.rb b/actionpack/test/template/test_case_test.rb
index eaa0c54f5a..f766c2c0b6 100644
--- a/actionpack/test/template/test_case_test.rb
+++ b/actionpack/test/template/test_case_test.rb
@@ -253,4 +253,17 @@ module ActionView
       end
     end
   end
+
+  module AHelperWithInitialize
+    def initialize(*)
+      super
+      @called_initialize = true
+    end
+  end
+
+  class AHelperWithInitializeTest < ActionView::TestCase
+    test "the helper's initialize was actually called" do
+      assert @called_initialize
+    end
+  end
 end