diff options
author | Yehuda Katz <wycats@gmail.com> | 2009-01-02 22:16:48 -0800 |
---|---|---|
committer | Yehuda Katz <wycats@gmail.com> | 2009-01-02 22:16:48 -0800 |
commit | a38c749d8b5fd020d7294ffb4d597d4ab3fb30db (patch) | |
tree | e841f423d995c4720576151a1e1d7215ff8ad92c /actionpack/test/template/asset_tag_helper_test.rb | |
parent | 42b32938d99d8f930e3020659ec0619aa5205c05 (diff) | |
download | rails-a38c749d8b5fd020d7294ffb4d597d4ab3fb30db.tar.gz rails-a38c749d8b5fd020d7294ffb4d597d4ab3fb30db.tar.bz2 rails-a38c749d8b5fd020d7294ffb4d597d4ab3fb30db.zip |
Sync 'rails/rails/master'
Diffstat (limited to 'actionpack/test/template/asset_tag_helper_test.rb')
-rw-r--r-- | actionpack/test/template/asset_tag_helper_test.rb | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/actionpack/test/template/asset_tag_helper_test.rb b/actionpack/test/template/asset_tag_helper_test.rb index 7597927f6d..5e2fc20167 100644 --- a/actionpack/test/template/asset_tag_helper_test.rb +++ b/actionpack/test/template/asset_tag_helper_test.rb @@ -38,8 +38,6 @@ class AssetTagHelperTest < ActionView::TestCase @controller.request = @request ActionView::Helpers::AssetTagHelper::reset_javascript_include_default - AssetTag::Cache.clear - AssetCollection::Cache.clear end def teardown @@ -281,6 +279,26 @@ class AssetTagHelperTest < ActionView::TestCase assert_equal copy, source end + def test_caching_image_path_with_caching_and_proc_asset_host_using_request + ENV['RAILS_ASSET_ID'] = '' + ActionController::Base.asset_host = Proc.new do |source, request| + if request.ssl? + "#{request.protocol}#{request.host_with_port}" + else + "#{request.protocol}assets#{source.length}.example.com" + end + end + + ActionController::Base.perform_caching = true + + + @controller.request.stubs(:ssl?).returns(false) + assert_equal "http://assets15.example.com/images/xml.png", image_path("xml.png") + + @controller.request.stubs(:ssl?).returns(true) + assert_equal "http://localhost/images/xml.png", image_path("xml.png") + end + def test_caching_javascript_include_tag_when_caching_on ENV["RAILS_ASSET_ID"] = "" ActionController::Base.asset_host = 'http://a0.example.com' |