diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-07-14 12:26:30 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-07-14 12:26:30 -0300 |
| commit | 7645a5f85d7fc88b5f05f7fe4b73b743078bb069 (patch) | |
| tree | 0c7a669115e55136a8c82c6d0863a24c9ccb86fc /actionview | |
| parent | 9cff2484695243248abcaa9ec1c5b246f1c28209 (diff) | |
| parent | e26d11c876d11bae09b95df941d14e21ac93e2f0 (diff) | |
| download | rails-7645a5f85d7fc88b5f05f7fe4b73b743078bb069.tar.gz rails-7645a5f85d7fc88b5f05f7fe4b73b743078bb069.tar.bz2 rails-7645a5f85d7fc88b5f05f7fe4b73b743078bb069.zip | |
Merge pull request #20877 from sikachu/rename-ac-test_response
Change AC::TestResponse to AD::TestResponse
Diffstat (limited to 'actionview')
| -rw-r--r-- | actionview/lib/action_view/test_case.rb | 2 | ||||
| -rw-r--r-- | actionview/test/actionpack/controller/view_paths_test.rb | 2 |
2 files changed, 2 insertions, 2 deletions
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 |