2 files changed, 8 insertions, 0 deletions
diff --git a/actionpack/test/template/render_test.rb b/actionpack/test/template/render_test.rb
index 9adf053b09..80fd549fd7 100644
--- a/actionpack/test/template/render_test.rb
+++ b/actionpack/test/template/render_test.rb
@@ -255,6 +255,12 @@ module RenderTestCases
       assert_equal Encoding::UTF_8, result.encoding
     end
   end
+
+  def test_render_with_backup_files
+    result = @view.render :file => "/test/backup_files/item"
+    assert_equal "The correct item.erb was loaded.\n", result
+  end
+
 end
 
 module TemplatesSetupTeardown
diff --git a/actionpack/test/template/template_test.rb b/actionpack/test/template/template_test.rb
index 7caec7ad9f..5c6523201b 100644
--- a/actionpack/test/template/template_test.rb
+++ b/actionpack/test/template/template_test.rb
@@ -19,6 +19,8 @@ class TemplateTest < Test::Unit::TestCase
       t.assert_parses_template_path 'abc',                    :extension => nil, :format => nil, :name => nil
       t.assert_parses_template_path 'abc.xxx',                :extension => nil, :format => 'xxx', :name => 'abc'
       t.assert_parses_template_path 'abc.html.xxx',           :extension => nil, :format => 'xxx', :name => 'abc'
+
+      t.assert_parses_template_path 'abc.html.erb.orig',      :format => 'orig', :extension => nil
     end
   end