Changeset 9119

Timestamp:

03/28/08 20:21:52 (5 months ago)

Author:

bitsweat

Message:

Missing :js template falls back to :html, so you don't have to explicitly specify template format everywhere, breaking old code

Files:

• trunk/actionpack/lib/action_view/template_finder.rb (modified) (1 diff)
• trunk/actionpack/test/template/template_object_test.rb (modified) (1 diff)

trunk/actionpack/lib/action_view/template_finder.rb

@@ -132 +132 @@
-    #
-    def pick_template_extension(template_path)
-
+
+
+
+
+
+
-    end
-
-
-@template.
+, template_format = @template.template_format
+
-
-      view_paths.each do |path|
-        if (extensions = @@file_extension_cache[path][formatted_template_path]).any?
-@template.
+
-        elsif (extensions = @@file_extension_cache[path][template_path]).any?
-          return extensions.first.to_s

trunk/actionpack/test/template/template_object_test.rb

@@ -60 +60 @@
-  end
-  
+  class PartialTemplateFallbackTest < Test::Unit::TestCase
+    def setup
+      @view = ActionView::Base.new(LOAD_PATH_ROOT)
+      @path = 'test/layout_for_partial'
+    end
+
+    def test_default
+      template = ActionView::PartialTemplate.new(@view, @path, nil)
+      assert_equal 'test/_layout_for_partial', template.path
+      assert_equal 'erb', template.extension
+      assert_equal :html, @view.template_format
+    end
+
+    def test_js
+      @view.template_format = :js
+      template = ActionView::PartialTemplate.new(@view, @path, nil)
+      assert_equal 'test/_layout_for_partial', template.path
+      assert_equal 'erb', template.extension
+      assert_equal :html, @view.template_format
+    end
+
+    def test_xml
+      @view.template_format = :xml
+      assert_raise ActionView::ActionViewError do
+        ActionView::PartialTemplate.new(@view, @path, nil)
+      end
+    end
+  end
-end