aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/metal
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2010-11-06 21:00:26 -0200
committerSantiago Pastorino <santiago@wyeworks.com>2010-11-06 21:15:03 -0200
commit2382667955df08599cb5df7bf3ef135817093d74 (patch)
tree51dd2cb4ea08c089e8e9dd1ad3fd45b36771ad8c /actionpack/lib/action_controller/metal
parentc11102d4f80267e3774985329ea93e7368e8684f (diff)
downloadrails-2382667955df08599cb5df7bf3ef135817093d74.tar.gz
rails-2382667955df08599cb5df7bf3ef135817093d74.tar.bz2
rails-2382667955df08599cb5df7bf3ef135817093d74.zip
Fix problems trying to functional test AC::Metal controllers
[#5393 state:committed]
Diffstat (limited to 'actionpack/lib/action_controller/metal')
-rw-r--r--actionpack/lib/action_controller/metal/testing.rb10
1 files changed, 1 insertions, 9 deletions
diff --git a/actionpack/lib/action_controller/metal/testing.rb b/actionpack/lib/action_controller/metal/testing.rb
index 4b8c452d50..01fd55e1dd 100644
--- a/actionpack/lib/action_controller/metal/testing.rb
+++ b/actionpack/lib/action_controller/metal/testing.rb
@@ -14,18 +14,10 @@ module ActionController
cookies.write(@_response)
end
@_response.prepare!
- set_test_assigns
+ @assigns = respond_to?(:view_assigns) ? view_assigns : {}
ret
end
- def set_test_assigns
- @assigns = {}
- (instance_variable_names - self.class.protected_instance_variables).each do |var|
- name, value = var[1..-1], instance_variable_get(var)
- @assigns[name] = value
- end
- end
-
# TODO : Rewrite tests using controller.headers= to use Rack env
def headers=(new_headers)
@_response ||= ActionDispatch::Response.new