Additional template render test for backup files [rails#2367 state:resolved]

Signed-off-by: Joshua Peek <[email protected]>

Author: e2

actionpack/test/fixtures/test/backup_files/item.html.erb

@@ -0,0 +1 @@
+The correct item.erb was loaded.

actionpack/test/fixtures/test/backup_files/item.html.erb.orig

@@ -0,0 +1 @@
+This is  an editor backup file and should never be loaded!

actionpack/test/template/render_test.rb

@@ -255,6 +255,12 @@ def test_render_utf8_template
       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

actionpack/test/template/template_test.rb

@@ -19,6 +19,8 @@ def test_template_path_parsing
       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