diff options
author | Brian Cardarella <bcardarella@gmail.com> | 2011-07-29 12:08:35 -0400 |
---|---|---|
committer | Brian Cardarella <bcardarella@gmail.com> | 2011-07-29 12:08:35 -0400 |
commit | 1c94ba03328775a79541e3240ff2469d237b9f3b (patch) | |
tree | 00ccd31d574632d53385ac91f11ccb33ae21ca8b | |
parent | 270fa63e9b16ae31371afa199d4de72afc41ac93 (diff) | |
download | rails-1c94ba03328775a79541e3240ff2469d237b9f3b.tar.gz rails-1c94ba03328775a79541e3240ff2469d237b9f3b.tar.bz2 rails-1c94ba03328775a79541e3240ff2469d237b9f3b.zip |
Instead of removing the instance variable just set it to nil, resolves the warnings because of a missing instance variable
-rw-r--r-- | actionpack/test/template/sprockets_helper_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/test/template/sprockets_helper_test.rb b/actionpack/test/template/sprockets_helper_test.rb index b9161b62c5..f4b5344d63 100644 --- a/actionpack/test/template/sprockets_helper_test.rb +++ b/actionpack/test/template/sprockets_helper_test.rb @@ -97,7 +97,7 @@ class SprocketsHelperTest < ActionView::TestCase 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 @@ class SprocketsHelperTest < ActionView::TestCase 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 |