diff options
| author | Prem Sichanugrist <s@sikac.hu> | 2015-07-14 09:27:42 -0400 |
|---|---|---|
| committer | Prem Sichanugrist <s@sikac.hu> | 2015-07-14 09:27:42 -0400 |
| commit | e26d11c876d11bae09b95df941d14e21ac93e2f0 (patch) | |
| tree | a4b294c64f5e74799261cda35c47556a4060209e | |
| parent | 368b9938ec9d8fbb8146e65c1edf744d32d207c9 (diff) | |
| download | rails-e26d11c876d11bae09b95df941d14e21ac93e2f0.tar.gz rails-e26d11c876d11bae09b95df941d14e21ac93e2f0.tar.bz2 rails-e26d11c876d11bae09b95df941d14e21ac93e2f0.zip | |
Change AC::TestResponse to AD::TestResponse
ActionController::TestResponse was removed in d9fe10c and caused a test
failure on Action View as its test case still refers to it.
| -rw-r--r-- | actionpack/lib/action_controller/test_case.rb | 2 | ||||
| -rw-r--r-- | actionpack/test/controller/helper_test.rb | 2 | ||||
| -rw-r--r-- | actionview/lib/action_view/test_case.rb | 2 | ||||
| -rw-r--r-- | actionview/test/actionpack/controller/view_paths_test.rb | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb index 558c03008e..098ef09c0e 100644 --- a/actionpack/lib/action_controller/test_case.rb +++ b/actionpack/lib/action_controller/test_case.rb @@ -230,7 +230,7 @@ module ActionController # request. You can modify this object before sending the HTTP request. For example, # you might want to set some session properties before sending a GET request. # <b>@response</b>:: - # An ActionController::TestResponse object, representing the response + # An ActionDispatch::TestResponse object, representing the response # of the last HTTP response. In the above example, <tt>@response</tt> becomes valid # after calling +post+. If the various assert methods are not sufficient, then you # may use this object to inspect the HTTP response in detail. diff --git a/actionpack/test/controller/helper_test.rb b/actionpack/test/controller/helper_test.rb index a96cfa3bf4..3ecfedefd1 100644 --- a/actionpack/test/controller/helper_test.rb +++ b/actionpack/test/controller/helper_test.rb @@ -151,7 +151,7 @@ class HelperTest < ActiveSupport::TestCase assert_equal "test: baz", call_controller(Fun::PdfController, "test").last.body # # request = ActionController::TestRequest.new - # response = ActionController::TestResponse.new + # response = ActionDispatch::TestResponse.new # request.action = 'test' # # assert_equal 'test: baz', Fun::PdfController.process(request, response).body diff --git a/actionview/lib/action_view/test_case.rb b/actionview/lib/action_view/test_case.rb index b4f36c1f78..c4bc26ca8a 100644 --- a/actionview/lib/action_view/test_case.rb +++ b/actionview/lib/action_view/test_case.rb @@ -25,7 +25,7 @@ module ActionView super self.class.controller_path = "" @request = ActionController::TestRequest.create - @response = ActionController::TestResponse.new + @response = ActionDispatch::TestResponse.new @request.env.delete('PATH_INFO') @params = {} diff --git a/actionview/test/actionpack/controller/view_paths_test.rb b/actionview/test/actionpack/controller/view_paths_test.rb index 2dd27358f7..e99659c802 100644 --- a/actionview/test/actionpack/controller/view_paths_test.rb +++ b/actionview/test/actionpack/controller/view_paths_test.rb @@ -24,7 +24,7 @@ class ViewLoadPathsTest < ActionController::TestCase def setup @request = ActionController::TestRequest.create - @response = ActionController::TestResponse.new + @response = ActionDispatch::TestResponse.new @controller = TestController.new @paths = TestController.view_paths end |