Ensure asset_path defaults to nil for application

2 files changed, 10 insertions, 1 deletions

diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index 182068071d..b248bc737c 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -138,6 +138,10 @@ module Rails
 
   protected
 
+    def default_asset_path
+      nil
+    end
+
     def default_middleware_stack
       ActionDispatch::MiddlewareStack.new.tap do |middleware|
         rack_cache = config.action_controller.perform_caching && config.action_dispatch.rack_cache
diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb
index b188fdfca1..cda0e0a135 100644
--- a/railties/lib/rails/engine.rb
+++ b/railties/lib/rails/engine.rb
@@ -499,7 +499,7 @@ module Rails
     end
 
     initializer :append_asset_paths do
-      config.asset_path ||= "/#{railtie_name}%s"
+      config.asset_path ||= default_asset_path
 
       public_path = paths["public"].first
       if config.compiled_asset_path && File.exist?(public_path)
@@ -553,6 +553,11 @@ module Rails
     end
 
   protected
+
+    def default_asset_path
+      "/#{railtie_name}%s"
+    end
+
     def routes?
       defined?(@routes)
     end