diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2016-07-28 00:27:32 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2016-10-10 01:36:00 -0300 |
| commit | 5860b3544c6f02f7d98a7546b463b9fa89f5adf7 (patch) | |
| tree | 9a683b656e050a997da6f3b24a35e8efb6ff3233 | |
| parent | a3ff9db69c79e559122c55791dda1e89e6c8d8f4 (diff) | |
| download | rails-5860b3544c6f02f7d98a7546b463b9fa89f5adf7.tar.gz rails-5860b3544c6f02f7d98a7546b463b9fa89f5adf7.tar.bz2 rails-5860b3544c6f02f7d98a7546b463b9fa89f5adf7.zip | |
Remove deprecated support passing path as `nil` in `ActionDispatch::Routing::Mapper#match`
| -rw-r--r-- | actionpack/CHANGELOG.md | 4 | ||||
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/mapper.rb | 6 | ||||
| -rw-r--r-- | actionpack/test/dispatch/routing_test.rb | 4 |
3 files changed, 6 insertions, 8 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index 44333b3432..8dba02a92c 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -1,3 +1,7 @@ +* Remove deprecated support passing path as `nil` in `ActionDispatch::Routing::Mapper#match`. + + *Rafael Mendonça França* + * Remove deprecated `cache_control` argument from `ActionDispatch::Static#initialize`. *Rafael Mendonça França* diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb index 4ec1b8ee1f..6db5ad8308 100644 --- a/actionpack/lib/action_dispatch/routing/mapper.rb +++ b/actionpack/lib/action_dispatch/routing/mapper.rb @@ -1558,11 +1558,7 @@ module ActionDispatch options = path path, to = options.find { |name, _value| name.is_a?(String) } - if path.nil? - ActiveSupport::Deprecation.warn "Omitting the route path is deprecated. "\ - "Specify the path with a String or a Symbol instead." - path = "" - end + raise ArgumentError, "Route path not specified" if path.nil? case to when Symbol diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb index 9b6e060955..74b764feb7 100644 --- a/actionpack/test/dispatch/routing_test.rb +++ b/actionpack/test/dispatch/routing_test.rb @@ -373,9 +373,7 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest post "create", as: "" put "update" get "remove", action: :destroy, as: :remove - tc.assert_deprecated do - get action: :show, as: :show - end + get "", action: :show, as: :show end end |