2 files changed, 13 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb b/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb
index 5f758d641a..8974258cf7 100644
--- a/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb
+++ b/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb
@@ -36,6 +36,14 @@ module ActionDispatch
       def debug_hash(object)
         object.to_hash.sort_by { |k, _| k.to_s }.map { |k, v| "#{k}: #{v.inspect rescue $!.message}" }.join("\n")
       end
+
+      def render(*)
+        if logger = ActionView::Base.logger
+          logger.silence { super }
+        else
+          super
+        end
+      end
     end
 
     def initialize(app, routes_app = nil, response_format = :default)
diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb
index 5627e79bb7..a7805edaa2 100644
--- a/actionpack/lib/action_dispatch/testing/integration.rb
+++ b/actionpack/lib/action_dispatch/testing/integration.rb
@@ -423,8 +423,11 @@ module ActionDispatch
           end
 
           def append_format_to(path)
-            path << @path_format unless @url_encoded_form
-            path
+            if @url_encoded_form
+              path + @path_format
+            else
+              path
+            end
           end
 
           def content_type