Permalink
Browse files

Merge pull request #2342 from bcardarella/remove_controller_instance_…

…variable_warnings_from_sprocket_helper_test

Resolve "instance variable @controller not initialized" warnings for sprocket_helper_test
  • Loading branch information...
spastorino committed Jul 29, 2011
2 parents 3e8fe1d + 1c94ba0 commit 455e9e748d97dc3b4f379563ca72d0ea15e73fa8
Showing with 2 additions and 2 deletions.
  1. +2 −2 actionpack/test/template/sprockets_helper_test.rb
@@ -97,7 +97,7 @@ def url_for(*args)
end
test "stylesheets served without a controller in scope cannot access the request" do
- remove_instance_variable("@controller")
+ @controller = nil
@config.action_controller.asset_host = Proc.new do |asset, request|
fail "This should not have been called."
end
@@ -107,7 +107,7 @@ def url_for(*args)
end
test "stylesheets served without a controller in do not use asset hosts when the default protocol is :request" do
- remove_instance_variable("@controller")
+ @controller = nil
@config.action_controller.asset_host = "assets-%d.example.com"
@config.action_controller.default_asset_host_protocol = :request
@config.action_controller.perform_caching = true

0 comments on commit 455e9e7

Please sign in to comment.