diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-07-17 14:43:08 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-07-17 14:43:08 -0700 |
| commit | 8f9702db5cdd2afeca267f883980d4dcd4659edc (patch) | |
| tree | 526b62a0565fbf89decc9148f3e935f313c6dc06 /actionpack/test | |
| parent | 636e6b7138864ceb1e309939cd879e710b287f3e (diff) | |
| parent | 7359597004a63277851acbc87f0267d3d63e17eb (diff) | |
| download | rails-8f9702db5cdd2afeca267f883980d4dcd4659edc.tar.gz rails-8f9702db5cdd2afeca267f883980d4dcd4659edc.tar.bz2 rails-8f9702db5cdd2afeca267f883980d4dcd4659edc.zip | |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'actionpack/test')
| -rw-r--r-- | actionpack/test/template/asset_tag_helper_test.rb | 5 |
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)) |