diff options
author | José Valim <jose.valim@gmail.com> | 2011-09-15 18:08:42 -0700 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2011-09-15 18:08:42 -0700 |
commit | 79c7f2337645bade3a80271d76acc8f141d7c4d5 (patch) | |
tree | 7c82f1dc90150fc4c26f389af5139b0cb53484fe /railties/test | |
parent | 8a32a58f6f95deeae1ffe6f5dba9c4d71fbc8dff (diff) | |
parent | b50394bf844d0520d5dca485b169bba87f6d009a (diff) | |
download | rails-79c7f2337645bade3a80271d76acc8f141d7c4d5.tar.gz rails-79c7f2337645bade3a80271d76acc8f141d7c4d5.tar.bz2 rails-79c7f2337645bade3a80271d76acc8f141d7c4d5.zip |
Merge pull request #3040 from guilleiguaran/asset-host-should-not-be-nil-precompile
config.action_controller.asset_host shouldn't set to nil during precompile
Diffstat (limited to 'railties/test')
-rw-r--r-- | railties/test/application/assets_test.rb | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb index 959914bcea..dfd950aae3 100644 --- a/railties/test/application/assets_test.rb +++ b/railties/test/application/assets_test.rb @@ -270,20 +270,6 @@ module ApplicationTests assert_match(/\/assets\/rails-([0-z]+)\.png/, File.read(file)) end - test "precompile ignore asset_host" do - app_file "app/assets/javascripts/application.css.erb", "<%= asset_path 'rails.png' %>" - add_to_config "config.action_controller.asset_host = Proc.new { |source, request| 'http://www.example.com/' }" - - capture(:stdout) do - Dir.chdir(app_path){ `bundle exec rake assets:precompile` } - end - - file = Dir["#{app_path}/public/assets/application.css"].first - content = File.read(file) - assert_match(/\/assets\/rails.png/, content) - assert_no_match(/www\.example\.com/, content) - end - test "precompile should handle utf8 filenames" do app_file "app/assets/images/レイルズ.png", "not a image really" add_to_config "config.assets.precompile = [ /\.png$$/, /application.(css|js)$/ ]" |