Deprecate exception#original_exception in favor of exception#cause

2 files changed, 24 insertions, 9 deletions

diff --git a/actionview/test/template/render_test.rb b/actionview/test/template/render_test.rb
index 00fc28a522..51bc59edae 100644
--- a/actionview/test/template/render_test.rb
+++ b/actionview/test/template/render_test.rb
@@ -352,8 +352,8 @@ module RenderTestCases
     exception = assert_raises ActionView::Template::Error do
       @controller_view.render("partial_name_local_variable")
     end
-    assert_instance_of NameError, exception.original_exception
-    assert_equal :partial_name_local_variable, exception.original_exception.name
+    assert_instance_of NameError, exception.cause
+    assert_equal :partial_name_local_variable, exception.cause.name
   end
 
   # TODO: The reason for this test is unclear, improve documentation
@@ -590,14 +590,14 @@ class LazyViewRenderTest < ActiveSupport::TestCase
   def test_render_utf8_template_with_incompatible_external_encoding
     with_external_encoding Encoding::SHIFT_JIS do
       e = assert_raises(ActionView::Template::Error) { @view.render(:file => "test/utf8", :formats => [:html], :layouts => "layouts/yield") }
-      assert_match 'Your template was not saved as valid Shift_JIS', e.original_exception.message
+      assert_match 'Your template was not saved as valid Shift_JIS', e.cause.message
     end
   end
 
   def test_render_utf8_template_with_partial_with_incompatible_encoding
     with_external_encoding Encoding::SHIFT_JIS do
       e = assert_raises(ActionView::Template::Error) { @view.render(:file => "test/utf8_magic_with_bare_partial", :formats => [:html], :layouts => "layouts/yield") }
-      assert_match 'Your template was not saved as valid Shift_JIS', e.original_exception.message
+      assert_match 'Your template was not saved as valid Shift_JIS', e.cause.message
     end
   end
 
diff --git a/actionview/test/template/template_error_test.rb b/actionview/test/template/template_error_test.rb
index 3971ec809c..54c1d53b60 100644
--- a/actionview/test/template/template_error_test.rb
+++ b/actionview/test/template/template_error_test.rb
@@ -2,19 +2,34 @@ require "abstract_unit"
 
 class TemplateErrorTest < ActiveSupport::TestCase
   def test_provides_original_message
-    error = ActionView::Template::Error.new("test", Exception.new("original"))
+    error = begin
+      raise Exception.new("original")
+    rescue Exception
+      raise ActionView::Template::Error.new("test") rescue $!
+    end
+
     assert_equal "original", error.message
   end
 
   def test_provides_original_backtrace
-    original_exception = Exception.new
-    original_exception.set_backtrace(%W[ foo bar baz ])
-    error = ActionView::Template::Error.new("test", original_exception)
+    error = begin
+      original_exception = Exception.new
+      original_exception.set_backtrace(%W[ foo bar baz ])
+      raise original_exception
+    rescue Exception
+      raise ActionView::Template::Error.new("test") rescue $!
+    end
+
     assert_equal %W[ foo bar baz ], error.backtrace
   end
 
   def test_provides_useful_inspect
-    error = ActionView::Template::Error.new("test", Exception.new("original"))
+    error = begin
+      raise Exception.new("original")
+    rescue Exception
+      raise ActionView::Template::Error.new("test") rescue $!
+    end
+
     assert_equal "#<ActionView::Template::Error: original>", error.inspect
   end
 end