github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

alias method chain process with test

Browse Source
This commit is contained in:
Joshua Peek
2009-04-30 23:36:47 -05:00
parent 1fcc7dbcc8
commit 05bd863c02
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
actionpack/lib/action_controller/testing/process.rb
View File

@@ -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

4
actionpack/test/controller/filters_test.rb
View File

@@ -674,7 +674,7 @@ class FilterTest < Test::Unit::TestCase
request.action = action
controller = controller.new if controller.is_a?(Class)
@controller = controller
@controller.process_with_test(request, ActionController::TestResponse.new)
@controller.process(request, ActionController::TestResponse.new)
end
end
@@ -917,6 +917,6 @@ class YieldingAroundFiltersTest < Test::Unit::TestCase
request.action = action
controller = controller.new if controller.is_a?(Class)
@controller = controller
@controller.process_with_test(request, ActionController::TestResponse.new)
@controller.process(request, ActionController::TestResponse.new)
end
end