2 files changed, 89 insertions, 41 deletions
diff --git a/railties/test/application/middleware/exceptions_test.rb b/railties/test/application/middleware/exceptions_test.rb
new file mode 100644
index 0000000000..0174352900
--- /dev/null
+++ b/railties/test/application/middleware/exceptions_test.rb
@@ -0,0 +1,89 @@
+# encoding: utf-8
+require 'isolation/abstract_unit'
+require 'rack/test'
+
+module ApplicationTests
+  class MiddlewareExceptionsTest < Test::Unit::TestCase
+    include ActiveSupport::Testing::Isolation
+    include Rack::Test::Methods
+
+    def setup
+      build_app
+      boot_rails
+    end
+
+    def teardown
+      teardown_app
+    end
+
+    test "show exceptions middleware filter backtrace before logging" do
+      my_middleware = Struct.new(:app) do
+        def call(env)
+          raise "Failure"
+        end
+      end
+
+      app.config.middleware.use my_middleware
+
+      stringio = StringIO.new
+      Rails.logger = Logger.new(stringio)
+
+      get "/"
+      assert_no_match(/action_dispatch/, stringio.string)
+    end
+
+    test "renders active record exceptions as 404" do
+      my_middleware = Struct.new(:app) do
+        def call(env)
+          raise ActiveRecord::RecordNotFound
+        end
+      end
+
+      app.config.middleware.use my_middleware
+
+      get "/"
+      assert_equal 404, last_response.status
+    end
+
+    test "unspecified route when set action_dispatch.show_exceptions to false" do
+      app.config.action_dispatch.show_exceptions = false
+
+      assert_raise(ActionController::RoutingError) do
+        get '/foo'
+      end
+    end
+
+    test "unspecified route when set action_dispatch.show_exceptions to true" do
+      app.config.action_dispatch.show_exceptions = true
+
+      assert_nothing_raised(ActionController::RoutingError) do
+        get '/foo'
+      end
+    end
+
+    test "displays diagnostics message when exception raised in template that contains UTF-8" do
+      app.config.action_dispatch.show_exceptions = true
+
+      controller :foo, <<-RUBY
+        class FooController < ActionController::Base
+          def index
+          end
+        end
+      RUBY
+
+      app_file 'app/views/foo/index.html.erb', <<-ERB
+        <% raise 'boooom' %>
+        ✓
+      ERB
+
+      app_file 'config/routes.rb', <<-RUBY
+        AppTemplate::Application.routes.draw do
+          match ':controller(/:action)'
+        end
+      RUBY
+
+      post '/foo', :utf8 => '✓'
+      assert_match(/boooom/, last_response.body)
+    end
+  end
+end
diff --git a/railties/test/application/middleware/show_exceptions_test.rb b/railties/test/application/middleware/show_exceptions_test.rb
deleted file mode 100644
index e3f27f63c3..0000000000
--- a/railties/test/application/middleware/show_exceptions_test.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-require 'isolation/abstract_unit'
-
-module ApplicationTests
-  class ShowExceptionsTest < Test::Unit::TestCase
-    include ActiveSupport::Testing::Isolation
-
-    def setup
-      build_app
-      boot_rails
-      FileUtils.rm_rf "#{app_path}/config/environments"
-    end
-
-    def teardown
-      teardown_app
-    end
-
-    def app
-      @app ||= Rails.application
-    end
-
-    test "unspecified route when set action_dispatch.show_exceptions to false" do
-      make_basic_app do |app|
-        app.config.action_dispatch.show_exceptions = false
-      end
-
-      assert_raise(ActionController::RoutingError) do
-        get '/foo'
-      end
-    end
-
-    test "unspecified route when set action_dispatch.show_exceptions to true" do
-      make_basic_app do |app|
-        app.config.action_dispatch.show_exceptions = true
-      end
-
-      assert_nothing_raised(ActionController::RoutingError) do
-        get '/foo'
-      end
-    end
-  end
-end