diff options
| -rw-r--r-- | actionpack/lib/sprockets/assets.rake | 3 | ||||
| -rw-r--r-- | railties/test/application/rake_test.rb | 16 |
2 files changed, 19 insertions, 0 deletions
diff --git a/actionpack/lib/sprockets/assets.rake b/actionpack/lib/sprockets/assets.rake index db0ddad3c2..0531b1509b 100644 --- a/actionpack/lib/sprockets/assets.rake +++ b/actionpack/lib/sprockets/assets.rake @@ -16,6 +16,9 @@ namespace :assets do # Always compile files Rails.application.config.assets.compile = true + # Always ignore asset host + Rails.application.config.action_controller.asset_host = nil + config = Rails.application.config env = Rails.application.assets target = Pathname.new(File.join(Rails.public_path, config.assets.prefix)) diff --git a/railties/test/application/rake_test.rb b/railties/test/application/rake_test.rb index 81eb7e7b24..80fd65cd9f 100644 --- a/railties/test/application/rake_test.rb +++ b/railties/test/application/rake_test.rb @@ -216,5 +216,21 @@ module ApplicationTests end end + def test_assets_precompile_ignore_asset_host + add_to_config <<-RUBY + config.action_controller.asset_host = Proc.new { |source, request| "http://www.example.com/" } + RUBY + + app_file "app/assets/javascripts/test.js.erb", <<-RUBY + alert("<%= asset_path "rails.png" %>"); + RUBY + + Dir.chdir(app_path) do + `rake assets:precompile` + open("public/assets/application.js") do |f| + assert_match(/\"\/assets\/rails.png\"/, f.read) + end + end + end end end |