aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorBrian Cardarella <bcardarella@gmail.com>2011-07-29 12:08:35 -0400
committerXavier Noria <fxn@hashref.com>2011-08-13 16:22:24 -0700
commit55fb1780a0695bc60ba7ab91084026d45c36b43e (patch)
tree6ef8faef0447fd7e0ea12346565aa49687f2e5a5 /actionpack
parent9d5340e7094444a35c48035d9f111617806d519c (diff)
downloadrails-55fb1780a0695bc60ba7ab91084026d45c36b43e.tar.gz
rails-55fb1780a0695bc60ba7ab91084026d45c36b43e.tar.bz2
rails-55fb1780a0695bc60ba7ab91084026d45c36b43e.zip
Instead of removing the instance variable just set it to nil, resolves the warnings because of a missing instance variable
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/test/template/sprockets_helper_test.rb4
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