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
This commit is contained in:
commit
455e9e748d
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user