Remove deprecated formatted named routes

2 files changed, 0 insertions, 26 deletions

diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb
index bd397432ce..792762ebd7 100644
--- a/actionpack/lib/action_dispatch/routing/route_set.rb
+++ b/actionpack/lib/action_dispatch/routing/route_set.rb
@@ -189,14 +189,6 @@ module ActionDispatch
                 url_for(#{hash_access_method}(opts))                                        #   url_for(hash_for_users_url(opts))
                                                                                             #
               end                                                                           # end
-              #Add an alias to support the now deprecated formatted_* URL.                  # #Add an alias to support the now deprecated formatted_* URL.
-              def formatted_#{selector}(*args)                                              # def formatted_users_url(*args)
-                ActiveSupport::Deprecation.warn(                                            #   ActiveSupport::Deprecation.warn(
-                  "formatted_#{selector}() has been deprecated. " +                         #     "formatted_users_url() has been deprecated. " +
-                  "Please pass format to the standard " +                                   #     "Please pass format to the standard " +
-                  "#{selector} method instead.", caller)                                    #     "users_url method instead.", caller)
-                #{selector}(*args)                                                          #   users_url(*args)
-              end                                                                           # end
               protected :#{selector}                                                        # protected :users_url
             end_eval
             helpers << selector
diff --git a/actionpack/test/controller/url_rewriter_test.rb b/actionpack/test/controller/url_rewriter_test.rb
index 428f40b9f8..139d91f8ac 100644
--- a/actionpack/test/controller/url_rewriter_test.rb
+++ b/actionpack/test/controller/url_rewriter_test.rb
@@ -347,24 +347,6 @@ class UrlWriterTests < ActionController::TestCase
     end
   end
 
-  def test_formatted_url_methods_are_deprecated
-    with_routing do |set|
-      set.draw do |map|
-        resources :posts
-      end
-      # We need to create a new class in order to install the new named route.
-      kls = Class.new { include ActionController::UrlWriter }
-      controller = kls.new
-      params = {:id => 1, :format => :xml}
-      assert_deprecated do
-        assert_equal("/posts/1.xml", controller.send(:formatted_post_path, params))
-      end
-      assert_deprecated do
-        assert_equal("/posts/1.xml", controller.send(:formatted_post_path, 1, :xml))
-      end
-    end
-  end
-
   def test_multiple_includes_maintain_distinct_options
     first_class = Class.new { include ActionController::UrlWriter }
     second_class = Class.new { include ActionController::UrlWriter }