Merge pull request #26226 from schneems/schneems/explicit-public-urls

Make public asset use explicit

2 files changed, 101 insertions, 0 deletions

diff --git a/railties/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults.rb.tt
index e539f4c457..5ad18cc5ad 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults.rb.tt
+++ b/railties/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults.rb.tt
@@ -32,3 +32,7 @@ ActiveSupport.halt_callback_chains_on_return_false = <%= options[:update] ? true
 # Configure SSL options to enable HSTS with subdomains. Previous versions had false.
 Rails.application.config.ssl_options = { hsts: { subdomains: true } }
 <%- end -%>
+
+# Unknown asset fallback will return the path passed in when the given
+# asset is not present in the asset pipeline.
+Rails.application.config.assets.unknown_asset_fallback = <%= options[:update] ? true : false %>
diff --git a/railties/test/application/asset_debugging_test.rb b/railties/test/application/asset_debugging_test.rb
index a732869d62..3e17a1efa5 100644
--- a/railties/test/application/asset_debugging_test.rb
+++ b/railties/test/application/asset_debugging_test.rb
@@ -68,5 +68,102 @@ module ApplicationTests
       assert_match(/<script src="\/assets\/application(\.self)?-([0-z]+)\.js\?body=1"><\/script>/, last_response.body)
       assert_match(/<script src="\/assets\/xmlhr(\.self)?-([0-z]+)\.js\?body=1"><\/script>/, last_response.body)
     end
+
+    test "public path and tag methods are not over-written by the asset pipeline" do
+      contents = "doesnotexist"
+      cases = {
+        asset_path:             %r{/#{contents}},
+        image_path:             %r{/images/#{contents}},
+        video_path:             %r{/videos/#{contents}},
+        audio_path:             %r{/audios/#{contents}},
+        font_path:              %r{/fonts/#{contents}},
+        javascript_path:        %r{/javascripts/#{contents}},
+        stylesheet_path:        %r{/stylesheets/#{contents}},
+        image_tag:              %r{<img src="/images/#{contents}"},
+        favicon_link_tag:       %r{<link rel="shortcut icon" type="image/x-icon" href="/images/#{contents}" />},
+        stylesheet_link_tag:    %r{<link rel="stylesheet" media="screen" href="/stylesheets/#{contents}.css" />},
+        javascript_include_tag: %r{<script src="/javascripts/#{contents}.js">},
+        audio_tag:              %r{<audio src="/audios/#{contents}"></audio>},
+        video_tag:              %r{<video src="/videos/#{contents}"></video>}
+      }
+
+      cases.each do |(view_method, tag_match)|
+        app_file "app/views/posts/index.html.erb", "<%= #{view_method} '#{contents}', skip_pipeline: true %>"
+
+        app "development"
+
+        class ::PostsController < ActionController::Base ; end
+
+        get "/posts?debug_assets=true"
+
+        body = last_response.body
+        assert_match(tag_match, body, "Expected `#{view_method}` to produce a match to #{tag_match}, but did not: #{body}")
+      end
+    end
+
+    test "public url methods are not over-written by the asset pipeline" do
+      contents = "doesnotexist"
+      cases = {
+        asset_url:       %r{http://example.org/#{contents}},
+        image_url:       %r{http://example.org/images/#{contents}},
+        video_url:       %r{http://example.org/videos/#{contents}},
+        audio_url:       %r{http://example.org/audios/#{contents}},
+        font_url:        %r{http://example.org/fonts/#{contents}},
+        javascript_url:  %r{http://example.org/javascripts/#{contents}},
+        stylesheet_url:  %r{http://example.org/stylesheets/#{contents}},
+      }
+
+      cases.each do |(view_method, tag_match)|
+        app_file "app/views/posts/index.html.erb", "<%= #{view_method} '#{contents}', skip_pipeline: true %>"
+
+        app "development"
+
+        class ::PostsController < ActionController::Base ; end
+
+        get "/posts?debug_assets=true"
+
+        body = last_response.body
+        assert_match(tag_match, body, "Expected `#{view_method}` to produce a match to #{tag_match}, but did not: #{body}")
+      end
+    end
+
+    test "{ skip_pipeline: true } does not use the asset pipeline" do
+      cases = {
+        /\/assets\/application-.*.\.js/ => {},
+        /application.js/                => { skip_pipeline: true },
+      }
+      cases.each do |(tag_match, options_hash)|
+        app_file "app/views/posts/index.html.erb", "<%= asset_path('application.js', #{options_hash}) %>"
+
+        app "development"
+
+        class ::PostsController < ActionController::Base ; end
+
+        get "/posts?debug_assets=true"
+
+        body = last_response.body.strip
+        assert_match(tag_match, body, "Expected `asset_path` with `#{options_hash}` to produce a match to #{tag_match}, but did not: #{body}")
+      end
+    end
+
+    test "public_compute_asset_path does not use the asset pipeline" do
+      cases = {
+        compute_asset_path:        /\/assets\/application-.*.\.js/,
+        public_compute_asset_path: /application.js/,
+      }
+
+      cases.each do |(view_method, tag_match)|
+        app_file "app/views/posts/index.html.erb", "<%= #{ view_method } 'application.js' %>"
+
+        app "development"
+
+        class ::PostsController < ActionController::Base ; end
+
+        get "/posts?debug_assets=true"
+
+        body = last_response.body.strip
+        assert_match(tag_match, body, "Expected `#{view_method}` to produce a match to #{ tag_match }, but did not: #{ body }")
+      end
+    end
   end
 end