AC railtie should configure helpers path.

2 files changed, 6 insertions, 3 deletions

diff --git a/actionpack/lib/action_controller/metal/helpers.rb b/actionpack/lib/action_controller/metal/helpers.rb
index 0ebdf07911..03ba4b3f83 100644
--- a/actionpack/lib/action_controller/metal/helpers.rb
+++ b/actionpack/lib/action_controller/metal/helpers.rb
@@ -50,9 +50,8 @@ module ActionController
     include AbstractController::Helpers
 
     included do
-      extlib_inheritable_accessor(:helpers_path) do
-        defined?(Rails::Application) ? Rails::Application.paths.app.helpers.to_a : []
-      end
+      extlib_inheritable_accessor(:helpers_path)
+      self.helpers_path = []
     end
 
     module ClassMethods
diff --git a/actionpack/lib/action_controller/railtie.rb b/actionpack/lib/action_controller/railtie.rb
index 29a0a346ec..9151de4462 100644
--- a/actionpack/lib/action_controller/railtie.rb
+++ b/actionpack/lib/action_controller/railtie.rb
@@ -21,5 +21,9 @@ module ActionController
     initializer "action_controller.initialize_framework_caches" do
       ActionController::Base.cache_store ||= RAILS_CACHE
     end
+
+    initializer "action_controller.set_helpers_path" do |app|
+      ActionController::Base.helpers_path = app.config.paths.app.helpers.to_a
+    end
   end
 end