aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/template/asset_tag_helper_test.rb
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2008-07-17 16:03:48 -0500
committerJoshua Peek <josh@joshpeek.com>2008-07-17 16:03:48 -0500
commit7359597004a63277851acbc87f0267d3d63e17eb (patch)
treed5e270049641af8bdced9992073546e64c2f2468 /actionpack/test/template/asset_tag_helper_test.rb
parent0eef4e554db9b1af47305f5a8c51c90c15ac6c04 (diff)
downloadrails-7359597004a63277851acbc87f0267d3d63e17eb.tar.gz
rails-7359597004a63277851acbc87f0267d3d63e17eb.tar.bz2
rails-7359597004a63277851acbc87f0267d3d63e17eb.zip
Wrap AssetTagHelper's computed public path cache in a threadsafe store
Diffstat (limited to 'actionpack/test/template/asset_tag_helper_test.rb')
-rw-r--r--actionpack/test/template/asset_tag_helper_test.rb5
1 files changed, 2 insertions, 3 deletions
diff --git a/actionpack/test/template/asset_tag_helper_test.rb b/actionpack/test/template/asset_tag_helper_test.rb
index 3cfc8fa4ed..0e7f9a94b7 100644
--- a/actionpack/test/template/asset_tag_helper_test.rb
+++ b/actionpack/test/template/asset_tag_helper_test.rb
@@ -39,8 +39,7 @@ class AssetTagHelperTest < ActionView::TestCase
@controller.request = @request
ActionView::Helpers::AssetTagHelper::reset_javascript_include_default
-
- ActionView::Base.computed_public_paths.clear
+ COMPUTED_PUBLIC_PATHS.clear
end
def teardown
@@ -161,7 +160,7 @@ class AssetTagHelperTest < ActionView::TestCase
ENV["RAILS_ASSET_ID"] = ""
JavascriptIncludeToTag.each { |method, tag| assert_dom_equal(tag, eval(method)) }
- ActionView::Base.computed_public_paths.clear
+ COMPUTED_PUBLIC_PATHS.clear
ENV["RAILS_ASSET_ID"] = "1"
assert_dom_equal(%(<script src="/javascripts/prototype.js?1" type="text/javascript"></script>\n<script src="/javascripts/effects.js?1" type="text/javascript"></script>\n<script src="/javascripts/dragdrop.js?1" type="text/javascript"></script>\n<script src="/javascripts/controls.js?1" type="text/javascript"></script>\n<script src="/javascripts/application.js?1" type="text/javascript"></script>), javascript_include_tag(:defaults))