diff options
author | Santiago Pastorino <santiago@wyeworks.com> | 2011-09-13 01:27:58 -0700 |
---|---|---|
committer | Santiago Pastorino <santiago@wyeworks.com> | 2011-09-13 01:27:58 -0700 |
commit | 536bb7b135285a434d67163df2bcd391558705de (patch) | |
tree | 88bb5e522b403ddd74f4131e4e3dc952442c8dc5 | |
parent | 5bad79d93011faae839a57edaa20195398ab5764 (diff) | |
parent | e767cda6ea171cf888c8e46b0c62e3c7df801a38 (diff) | |
download | rails-536bb7b135285a434d67163df2bcd391558705de.tar.gz rails-536bb7b135285a434d67163df2bcd391558705de.tar.bz2 rails-536bb7b135285a434d67163df2bcd391558705de.zip |
Merge pull request #2996 from guilleiguaran/move-assets-tests
Move asset tests to assets_test file
-rw-r--r-- | railties/test/application/assets_test.rb | 31 | ||||
-rw-r--r-- | railties/test/application/rake_test.rb | 31 |
2 files changed, 31 insertions, 31 deletions
diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb index b8a8665b3e..95fcb4a3dd 100644 --- a/railties/test/application/assets_test.rb +++ b/railties/test/application/assets_test.rb @@ -1,3 +1,4 @@ +# -*- coding: utf-8 -*- require 'isolation/abstract_unit' require 'active_support/core_ext/kernel/reporting' require 'rack/test' @@ -268,6 +269,36 @@ 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-([0-z]+)\.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)$/ ]" + + capture(:stdout) do + Dir.chdir(app_path){ `bundle exec rake assets:precompile` } + end + + assert File.exists?("#{app_path}/public/assets/レイルズ.png") + + manifest = "#{app_path}/public/assets/manifest.yml" + + assets = YAML.load_file(manifest) + assert_equal "レイルズ.png", assets["レイルズ.png"] + end + test "assets are cleaned up properly" do app_file "public/assets/application.js", "alert();" app_file "public/assets/application.css", "a { color: green; }" diff --git a/railties/test/application/rake_test.rb b/railties/test/application/rake_test.rb index 80fd65cd9f..c76bc3d526 100644 --- a/railties/test/application/rake_test.rb +++ b/railties/test/application/rake_test.rb @@ -201,36 +201,5 @@ module ApplicationTests assert_match(/7 tests, 10 assertions, 0 failures, 0 errors/, content) end - - def test_assets_precompile_with_utf8_filename - add_to_config <<-RUBY - config.assets.precompile = [ /\.png$$/, /application.(css|js)$/ ] - RUBY - - Dir.chdir(app_path) do - `cp app/assets/images/rails.png app/assets/images/レイルズ.png` - `rake assets:precompile` - open("public/assets/manifest.yml") do |f| - assert_match(/レイルズ.png/, f.read) - end - 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 |