Merge branch 'template_error' into merge

* template_error:
  Ensure original exception message is present in both Template::Error#message and Template::Error#inspect.
  ActiveSupport::Deprecation.silence no longer needed.

2 files changed, 14 insertions, 4 deletions

diff --git a/actionpack/lib/action_view/template/error.rb b/actionpack/lib/action_view/template/error.rb
index d7d98e1dd5..e246646963 100644
--- a/actionpack/lib/action_view/template/error.rb
+++ b/actionpack/lib/action_view/template/error.rb
@@ -56,6 +56,7 @@ module ActionView
       attr_reader :original_exception, :backtrace
 
       def initialize(template, assigns, original_exception)
+        super(original_exception.message)
         @template, @assigns, @original_exception = template, assigns.dup, original_exception
         @sub_templates = nil
         @backtrace = original_exception.backtrace
@@ -65,10 +66,6 @@ module ActionView
         @template.identifier
       end
 
-      def message
-        ActiveSupport::Deprecation.silence { original_exception.message }
-      end
-
       def sub_template_message
         if @sub_templates
           "Trace of template inclusion: " +
diff --git a/actionpack/test/template/template_error_test.rb b/actionpack/test/template/template_error_test.rb
new file mode 100644
index 0000000000..3a874082d9
--- /dev/null
+++ b/actionpack/test/template/template_error_test.rb
@@ -0,0 +1,13 @@
+require "abstract_unit"
+
+class TemplateErrorTest < ActiveSupport::TestCase
+  def test_provides_original_message
+    error = ActionView::Template::Error.new("test", {}, Exception.new("original"))
+    assert_equal "original", error.message
+  end
+
+  def test_provides_useful_inspect
+    error = ActionView::Template::Error.new("test", {}, Exception.new("original"))
+    assert_equal "#<ActionView::Template::Error: original>", error.inspect
+  end
+end