aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2009-04-30 23:36:47 -0500
committerJoshua Peek <josh@joshpeek.com>2009-04-30 23:46:35 -0500
commit05bd863c022601bb0bbd17c51adbcb420f349323 (patch)
tree423b819e2dd55740501f2fb1d56d83ecdd3e0be1 /actionpack/lib
parent1fcc7dbcc8dcf7f1d42ca8486ad313f0c805033a (diff)
downloadrails-05bd863c022601bb0bbd17c51adbcb420f349323.tar.gz
rails-05bd863c022601bb0bbd17c51adbcb420f349323.tar.bz2
rails-05bd863c022601bb0bbd17c51adbcb420f349323.zip
alias method chain process with test
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_controller/testing/process.rb9
1 files changed, 6 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/testing/process.rb b/actionpack/lib/action_controller/testing/process.rb
index 786dc67e2e..8315a160ad 100644
--- a/actionpack/lib/action_controller/testing/process.rb
+++ b/actionpack/lib/action_controller/testing/process.rb
@@ -132,7 +132,7 @@ module ActionController #:nodoc:
build_request_uri(action, parameters)
Base.class_eval { include ProcessWithTest } unless Base < ProcessWithTest
- @controller.process_with_test(@request, @response)
+ @controller.process(@request, @response)
end
def xml_http_request(request_method, action, parameters = nil, session = nil, flash = nil)
@@ -248,11 +248,14 @@ module ActionController #:nodoc:
module ProcessWithTest #:nodoc:
def self.included(base)
- base.class_eval { attr_reader :assigns }
+ base.class_eval {
+ attr_reader :assigns
+ alias_method_chain :process, :test
+ }
end
def process_with_test(*args)
- process(*args).tap { set_test_assigns }
+ process_without_test(*args).tap { set_test_assigns }
end
private