Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed that ActionView#file_exists? would be incorrect if @first_rende…

…r is set (closes #10569) [dbussink]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8385 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit 78727dd8e226f16fd2446db0bcaf41e127ba9bc8 1 parent 7a22435
David Heinemeier Hansson dhh authored
2  actionpack/CHANGELOG
View
@@ -1,5 +1,7 @@
*SVN*
+* Fixed that ActionView#file_exists? would be incorrect if @first_render is set #10569 [dbussink]
+
* Added that Array#to_param calls to_param on all it's elements #10473 [brandon]
* Ensure asset cache directories are automatically created. #10337 [Josh Peek, Chu Yeow]
2  actionpack/lib/action_view/base.rb
View
@@ -404,7 +404,7 @@ def file_exists?(template_path)#:nodoc:
if template_file_extension
template_exists?(template_file_name, template_file_extension)
else
- pick_template_extension(template_path)
+ template_exists?(template_file_name, pick_template_extension(template_path))
end
end
18 actionpack/test/action_view_test.rb
View
@@ -23,4 +23,22 @@ def test_find_template_extension_from_first_render
assert_equal expectation, base.send(:find_template_extension_from_first_render)
end
end
+
+ def test_should_report_file_exists_correctly
+ base = ActionView::Base.new
+
+ assert_nil base.send(:find_template_extension_from_first_render)
+
+ assert_equal false, base.send(:file_exists?, 'test.rhtml')
+ assert_equal false, base.send(:file_exists?, 'test.rb')
+
+ base.instance_variable_set('@first_render', 'foo.rb')
+
+ assert_equal 'rb', base.send(:find_template_extension_from_first_render)
+
+ assert_equal false, base.send(:file_exists?, 'baz')
+ assert_equal false, base.send(:file_exists?, 'baz.rb')
+
+ end
+
end
Please sign in to comment.
Something went wrong with that request. Please try again.