diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2015-07-13 17:52:02 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2015-07-13 17:52:02 -0700 |
| commit | d9fe10cb8ab05f6575a06f14991cd938052227dd (patch) | |
| tree | 0faa6fd9cbdaf6805ae4c9225e3810415f041843 | |
| parent | b37e29ec2db099b68ac3d80d1119774ae3688757 (diff) | |
| download | rails-d9fe10cb8ab05f6575a06f14991cd938052227dd.tar.gz rails-d9fe10cb8ab05f6575a06f14991cd938052227dd.tar.bz2 rails-d9fe10cb8ab05f6575a06f14991cd938052227dd.zip | |
only have one TestResponse class
| -rw-r--r-- | actionpack/lib/action_controller/test_case.rb | 5 | ||||
| -rw-r--r-- | actionpack/test/controller/action_pack_assertions_test.rb | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb index ad9836f122..558c03008e 100644 --- a/actionpack/lib/action_controller/test_case.rb +++ b/actionpack/lib/action_controller/test_case.rb @@ -132,9 +132,6 @@ module ActionController end.new end - class TestResponse < ActionDispatch::TestResponse - end - class LiveTestResponse < Live::Response # Was the response successful? alias_method :success?, :successful? @@ -535,7 +532,7 @@ module ActionController def setup_controller_request_and_response @controller = nil unless defined? @controller - @response_klass = TestResponse + @response_klass = ActionDispatch::TestResponse if klass = self.class.controller_class if klass < ActionController::Live diff --git a/actionpack/test/controller/action_pack_assertions_test.rb b/actionpack/test/controller/action_pack_assertions_test.rb index 5b85e83045..017b309af4 100644 --- a/actionpack/test/controller/action_pack_assertions_test.rb +++ b/actionpack/test/controller/action_pack_assertions_test.rb @@ -351,7 +351,7 @@ class ActionPackAssertionsControllerTest < ActionController::TestCase def test_response_object process :nothing - assert_kind_of ActionController::TestResponse, @response + assert_kind_of ActionDispatch::TestResponse, @response end def test_render_based_on_parameters |