diff options
| author | Andrew White <pixeltrix@users.noreply.github.com> | 2016-03-01 17:31:14 +0000 |
|---|---|---|
| committer | Andrew White <pixeltrix@users.noreply.github.com> | 2016-03-01 17:31:14 +0000 |
| commit | f2c707a64ee8683ee7bc4f1bc0254afcaa0ff676 (patch) | |
| tree | 4c4680606065ff4bb7bb8e9c5ee5b9bd51b4861b /railties/test | |
| parent | 3e43ba67209751468857a350ded6ea40aad2a2ba (diff) | |
| parent | 6520ea5f7e2215a763ca74bf6cfa87be2347d5df (diff) | |
| download | rails-f2c707a64ee8683ee7bc4f1bc0254afcaa0ff676.tar.gz rails-f2c707a64ee8683ee7bc4f1bc0254afcaa0ff676.tar.bz2 rails-f2c707a64ee8683ee7bc4f1bc0254afcaa0ff676.zip | |
Merge pull request #23980 from rails/deprecate-controller-action-segments
Deprecate :controller and :action path parameters
Diffstat (limited to 'railties/test')
| -rw-r--r-- | railties/test/isolation/abstract_unit.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/test/isolation/abstract_unit.rb b/railties/test/isolation/abstract_unit.rb index 66a8cf54af..f72218b65c 100644 --- a/railties/test/isolation/abstract_unit.rb +++ b/railties/test/isolation/abstract_unit.rb @@ -124,7 +124,7 @@ module TestHelpers routes = File.read("#{app_path}/config/routes.rb") if routes =~ /(\n\s*end\s*)\Z/ File.open("#{app_path}/config/routes.rb", 'w') do |f| - f.puts $` + "\nmatch ':controller(/:action(/:id))(.:format)', via: :all\n" + $1 + f.puts $` + "\nActiveSupport::Deprecation.silence { match ':controller(/:action(/:id))(.:format)', via: :all }\n" + $1 end end |