diff options
Diffstat (limited to 'actionpack/lib/action_controller/new_base/testing.rb')
-rw-r--r-- | actionpack/lib/action_controller/new_base/testing.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/new_base/testing.rb b/actionpack/lib/action_controller/new_base/testing.rb index 78051a6252..a4a1116d9e 100644 --- a/actionpack/lib/action_controller/new_base/testing.rb +++ b/actionpack/lib/action_controller/new_base/testing.rb @@ -1,6 +1,8 @@ module ActionController module Testing - extend ActiveSupport::DependencyModule + extend ActiveSupport::Concern + + include RackConvenience # OMG MEGA HAX def process_with_new_base_test(request, response) @@ -13,7 +15,7 @@ module ActionController set_test_assigns ret end - + def set_test_assigns @assigns = {} (instance_variable_names - self.class.protected_instance_variables).each do |var| @@ -33,6 +35,5 @@ module ActionController _process_action_callbacks.find_all{|x| x.kind == :before}.map{|x| x.name} end end - end end |