diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2016-08-11 08:27:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-11 08:27:35 +0200 |
| commit | 7c279ad696e1154b2f2dbef26ba0ff0a42aa105a (patch) | |
| tree | b38d1f6a90faf2ed412c74665604bed02a7bf2f3 | |
| parent | 5cb6b887d410fcd1ea821b32374a17a94acdc413 (diff) | |
| parent | 7924be5a7996dbbfa2b47fa717c2f4b8de4e0a81 (diff) | |
| download | rails-7c279ad696e1154b2f2dbef26ba0ff0a42aa105a.tar.gz rails-7c279ad696e1154b2f2dbef26ba0ff0a42aa105a.tar.bz2 rails-7c279ad696e1154b2f2dbef26ba0ff0a42aa105a.zip | |
Merge pull request #26114 from kamipo/fix_test_failure
Fix actionview test failure
| -rw-r--r-- | actionview/lib/action_view/test_case.rb | 2 | ||||
| -rw-r--r-- | actionview/test/actionpack/controller/view_paths_test.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/actionview/lib/action_view/test_case.rb b/actionview/lib/action_view/test_case.rb index 42fa17d1e0..2945aceb3e 100644 --- a/actionview/lib/action_view/test_case.rb +++ b/actionview/lib/action_view/test_case.rb @@ -24,7 +24,7 @@ module ActionView def initialize super self.class.controller_path = "" - @request = ActionController::TestRequest.create + @request = ActionController::TestRequest.create(self.class) @response = ActionDispatch::TestResponse.new @request.env.delete("PATH_INFO") diff --git a/actionview/test/actionpack/controller/view_paths_test.rb b/actionview/test/actionpack/controller/view_paths_test.rb index 085e803c6c..9471c76921 100644 --- a/actionview/test/actionpack/controller/view_paths_test.rb +++ b/actionview/test/actionpack/controller/view_paths_test.rb @@ -23,9 +23,9 @@ class ViewLoadPathsTest < ActionController::TestCase end def setup - @request = ActionController::TestRequest.create - @response = ActionDispatch::TestResponse.new @controller = TestController.new + @request = ActionController::TestRequest.create(@controller.class) + @response = ActionDispatch::TestResponse.new @paths = TestController.view_paths end |