aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller/test_case_test.rb
diff options
context:
space:
mode:
authorAndrew White <pixeltrix@users.noreply.github.com>2016-03-01 17:31:14 +0000
committerAndrew White <pixeltrix@users.noreply.github.com>2016-03-01 17:31:14 +0000
commitf2c707a64ee8683ee7bc4f1bc0254afcaa0ff676 (patch)
tree4c4680606065ff4bb7bb8e9c5ee5b9bd51b4861b /actionpack/test/controller/test_case_test.rb
parent3e43ba67209751468857a350ded6ea40aad2a2ba (diff)
parent6520ea5f7e2215a763ca74bf6cfa87be2347d5df (diff)
downloadrails-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 'actionpack/test/controller/test_case_test.rb')
-rw-r--r--actionpack/test/controller/test_case_test.rb17
1 files changed, 13 insertions, 4 deletions
diff --git a/actionpack/test/controller/test_case_test.rb b/actionpack/test/controller/test_case_test.rb
index 0c1393548e..ebcdda6074 100644
--- a/actionpack/test/controller/test_case_test.rb
+++ b/actionpack/test/controller/test_case_test.rb
@@ -167,7 +167,9 @@ XML
@request.delete_header 'PATH_INFO'
@routes = ActionDispatch::Routing::RouteSet.new.tap do |r|
r.draw do
- get ':controller(/:action(/:id))'
+ ActiveSupport::Deprecation.silence do
+ get ':controller(/:action(/:id))'
+ end
end
end
end
@@ -672,7 +674,10 @@ XML
with_routing do |set|
set.draw do
get 'file/*path', to: 'test_case_test/test#test_params'
- get ':controller/:action'
+
+ ActiveSupport::Deprecation.silence do
+ get ':controller/:action'
+ end
end
get :test_params, params: { path: ['hello', 'world'] }
@@ -1008,7 +1013,9 @@ class ResponseDefaultHeadersTest < ActionController::TestCase
@request.env['PATH_INFO'] = nil
@routes = ActionDispatch::Routing::RouteSet.new.tap do |r|
r.draw do
- get ':controller(/:action(/:id))'
+ ActiveSupport::Deprecation.silence do
+ get ':controller(/:action(/:id))'
+ end
end
end
end
@@ -1135,7 +1142,9 @@ class AnonymousControllerTest < ActionController::TestCase
@routes = ActionDispatch::Routing::RouteSet.new.tap do |r|
r.draw do
- get ':controller(/:action(/:id))'
+ ActiveSupport::Deprecation.silence do
+ get ':controller(/:action(/:id))'
+ end
end
end
end