From 40f9fd39f6b471cb35b551b456f2c22d52f1b825 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Mon, 24 Sep 2007 19:47:45 +0000 Subject: Include asset host in public path cache key. Clear cache between asset tag tests. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7617 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/test/template/asset_tag_helper_test.rb | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'actionpack/test') diff --git a/actionpack/test/template/asset_tag_helper_test.rb b/actionpack/test/template/asset_tag_helper_test.rb index 7708154048..1463ee1dce 100644 --- a/actionpack/test/template/asset_tag_helper_test.rb +++ b/actionpack/test/template/asset_tag_helper_test.rb @@ -33,11 +33,14 @@ class AssetTagHelperTest < Test::Unit::TestCase @request = Class.new do def relative_url_root() "" end + def protocol() 'http://' end end.new @controller.request = @request ActionView::Helpers::AssetTagHelper::reset_javascript_include_default + + ActionView::Base.computed_public_paths.clear end def teardown @@ -128,6 +131,8 @@ class AssetTagHelperTest < Test::Unit::TestCase ENV["RAILS_ASSET_ID"] = "" JavascriptIncludeToTag.each { |method, tag| assert_dom_equal(tag, eval(method)) } + ActionView::Base.computed_public_paths.clear + ENV["RAILS_ASSET_ID"] = "1" assert_dom_equal(%(\n\n\n\n), javascript_include_tag(:defaults)) end -- cgit v1.2.3