diff options
author | Rafael França <rafaelmfranca@gmail.com> | 2018-11-20 15:57:53 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-11-20 15:57:53 -0500 |
commit | eb22adce9a3a0d8d02c27d7afc944857e9ca0ada (patch) | |
tree | 449385b6004d6c3d91f41b2e0eb8e990fc97ee0f /actionpack/test | |
parent | 023a840f5f10c5a611a0618ff8ea9e16cd771f93 (diff) | |
parent | dde9c488398293fb1cbdc02595b8c4e9860b03cc (diff) | |
download | rails-eb22adce9a3a0d8d02c27d7afc944857e9ca0ada.tar.gz rails-eb22adce9a3a0d8d02c27d7afc944857e9ca0ada.tar.bz2 rails-eb22adce9a3a0d8d02c27d7afc944857e9ca0ada.zip |
Merge pull request #34494 from gmcgibbon/warn_root_conflict
Stop using unnamed roots on conflict
Diffstat (limited to 'actionpack/test')
-rw-r--r-- | actionpack/test/dispatch/routing_test.rb | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb index affc2d8497..4dffbd0db1 100644 --- a/actionpack/test/dispatch/routing_test.rb +++ b/actionpack/test/dispatch/routing_test.rb @@ -3698,15 +3698,25 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest end end - def test_multiple_roots + def test_multiple_roots_raises_error + ex = assert_raises(ArgumentError) { + draw do + root "pages#index", constraints: { host: "www.example.com" } + root "admin/pages#index", constraints: { host: "admin.example.com" } + end + } + assert_match(/Invalid route name, already in use: 'root'/, ex.message) + end + + def test_multiple_named_roots draw do namespace :foo do root "pages#index", constraints: { host: "www.example.com" } - root "admin/pages#index", constraints: { host: "admin.example.com" } + root "admin/pages#index", constraints: { host: "admin.example.com" }, as: :admin_root end root "pages#index", constraints: { host: "www.example.com" } - root "admin/pages#index", constraints: { host: "admin.example.com" } + root "admin/pages#index", constraints: { host: "admin.example.com" }, as: :admin_root end get "http://www.example.com/foo" |