diff options
author | Aaron Patterson <tenderlove@github.com> | 2018-09-25 09:27:37 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-25 09:27:37 -0700 |
commit | 6d698fdb070f4134c1795e8befb4e4c5e29a682f (patch) | |
tree | ccbaae1d82da6abfc99e151752a557a99da83dfc /actionview/test/actionpack/controller/view_paths_test.rb | |
parent | 4f12139a22f70ff0abc1709b8888011f8bfee42c (diff) | |
parent | 3301804ff6abcd5aae06cc5acbb82bc6a472f008 (diff) | |
download | rails-6d698fdb070f4134c1795e8befb4e4c5e29a682f.tar.gz rails-6d698fdb070f4134c1795e8befb4e4c5e29a682f.tar.bz2 rails-6d698fdb070f4134c1795e8befb4e4c5e29a682f.zip |
Merge pull request #33973 from rails/remove-catch-all
Remove deprecated catch-all route in the AV tests
Diffstat (limited to 'actionview/test/actionpack/controller/view_paths_test.rb')
-rw-r--r-- | actionview/test/actionpack/controller/view_paths_test.rb | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/actionview/test/actionpack/controller/view_paths_test.rb b/actionview/test/actionpack/controller/view_paths_test.rb index 45c662f0ce..7f3fe0fa08 100644 --- a/actionview/test/actionpack/controller/view_paths_test.rb +++ b/actionview/test/actionpack/controller/view_paths_test.rb @@ -24,11 +24,17 @@ class ViewLoadPathsTest < ActionController::TestCase end end + with_routes do + get :hello_world, to: "test#hello_world" + get :hello_world_at_request_time, to: "test#hello_world_at_request_time" + end + def setup @controller = TestController.new @request = ActionController::TestRequest.create(@controller.class) @response = ActionDispatch::TestResponse.new @paths = TestController.view_paths + super end def teardown @@ -109,6 +115,10 @@ class ViewLoadPathsTest < ActionController::TestCase def test_view_paths_override_for_layouts_in_controllers_with_a_module @controller = Test::SubController.new + with_routes do + get :hello_world, to: "view_load_paths_test/test/sub#hello_world" + end + Test::SubController.view_paths = [ "#{FIXTURE_LOAD_PATH}/override", FIXTURE_LOAD_PATH, "#{FIXTURE_LOAD_PATH}/override2" ] get :hello_world assert_response :success |