Merge branch 'p' of https://github.com/jfirebaugh/openstreetmap-website into jfirebaugh-p

[rails.git] / config / initializers / action_dispatch.rb

diff --git a/config/initializers/action_dispatch.rb b/config/initializers/action_dispatch.rb
index af446fc1de52112298cff00a787f64e4a1412ee7..687ce3fb11f26f0f3c046164dbc3b40a1873a6ef 100644 (file)
--- a/config/initializers/action_dispatch.rb
+++ b/config/initializers/action_dispatch.rb
@@ -1,17 +1,2 @@
 # Stop rails from automatically parsing XML in request bodies
 Rails.configuration.middleware.delete ActionDispatch::ParamsParser
 # Stop rails from automatically parsing XML in request bodies
 Rails.configuration.middleware.delete ActionDispatch::ParamsParser

-
-# https://github.com/rails/rails/issues/20710
-module ActionDispatch
-  module Assertions
-    def html_document_with_rss
-      @html_document ||= if @response.content_type == Mime::RSS
-                           Nokogiri::XML::Document.parse(@response.body)
-                         else
-                           html_document_without_rss
-                         end
-    end
-
-    alias_method_chain :html_document, :rss
-  end
-end