Changeset 8385

Timestamp:

12/14/07 18:07:20 (9 months ago)

Author:

david

Message:

Fixed that ActionView#file_exists? would be incorrect if @first_render is set (closes #10569) [dbussink]

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_view/base.rb (modified) (1 diff)
• trunk/actionpack/test/action_view_test.rb (modified) (1 diff)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*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]

trunk/actionpack/lib/action_view/base.rb

@@ -405 +405 @@
-        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

trunk/actionpack/test/action_view_test.rb

@@ -24 +24 @@
-    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