Merge branch 'master' of https://github.com/rails/rails

1 files changed, 107 insertions, 29 deletions

diff --git a/actionpack/test/template/template_test.rb b/actionpack/test/template/template_test.rb
index 18e0e83ec3..3432a02c3c 100644
--- a/actionpack/test/template/template_test.rb
+++ b/actionpack/test/template/template_test.rb
@@ -1,18 +1,21 @@
 require "abstract_unit"
-
-if "ruby".encoding_aware?
-  # These are the normal settings that will be set up by Railties
-  # TODO: Have these tests support other combinations of these values
-  Encoding.default_internal = "UTF-8"
-  Encoding.default_external = "UTF-8"
-end
+require "logger"
 
 class TestERBTemplate < ActiveSupport::TestCase
-  ERBHandler = ActionView::Template::Handlers::ERB
+  ERBHandler = ActionView::Template::Handlers::ERB.new
+
+  class LookupContext
+    def disable_cache
+      yield
+    end
+  end
 
   class Context
+    attr_accessor :_template
+
     def initialize
       @output_buffer = "original"
+      @_virtual_path = nil
     end
 
     def hello
@@ -21,15 +24,18 @@ class TestERBTemplate < ActiveSupport::TestCase
 
     def partial
       ActionView::Template.new(
-        "<%= @_virtual_path %>",
+        "<%= @_template.virtual_path %>",
         "partial",
         ERBHandler,
         :virtual_path => "partial"
       )
     end
 
+    def lookup_context
+      @lookup_context ||= LookupContext.new
+    end
+
     def logger
-      require "logger"
       Logger.new(STDERR)
     end
 
@@ -38,16 +44,16 @@ class TestERBTemplate < ActiveSupport::TestCase
     end
   end
 
-  def new_template(body = "<%= hello %>", handler = ERBHandler, details = {})
-    ActionView::Template.new(body, "hello template", ERBHandler, {:virtual_path => "hello"})
+  def new_template(body = "<%= hello %>", details = {})
+    ActionView::Template.new(body, "hello template", ERBHandler, {:virtual_path => "hello"}.merge!(details))
   end
 
   def render(locals = {})
-    @template.render(@obj, locals)
+    @template.render(@context, locals)
   end
 
   def setup
-    @obj = Context.new
+    @context = Context.new
   end
 
   def test_basic_template
@@ -55,24 +61,96 @@ class TestERBTemplate < ActiveSupport::TestCase
     assert_equal "Hello", render
   end
 
+  def test_template_loses_its_source_after_rendering
+    @template = new_template
+    render
+    assert_nil @template.source
+  end
+
+  def test_template_does_not_lose_its_source_after_rendering_if_it_does_not_have_a_virtual_path
+    @template = new_template("Hello", :virtual_path => nil)
+    render
+    assert_equal "Hello", @template.source
+  end
+
   def test_locals
     @template = new_template("<%= my_local %>")
+    @template.locals = [:my_local]
     assert_equal "I'm a local", render(:my_local => "I'm a local")
   end
 
   def test_restores_buffer
     @template = new_template
     assert_equal "Hello", render
-    assert_equal "original", @obj.my_buffer
+    assert_equal "original", @context.my_buffer
   end
 
   def test_virtual_path
-    @template = new_template("<%= @_virtual_path %>" \
+    @template = new_template("<%= @_template.virtual_path %>" \
                              "<%= partial.render(self, {}) %>" \
-                             "<%= @_virtual_path %>")
+                             "<%= @_template.virtual_path %>")
     assert_equal "hellopartialhello", render
   end
 
+  def test_refresh_with_templates
+    @template = new_template("Hello", :virtual_path => "test/foo/bar")
+    @template.locals = [:key]
+    @context.lookup_context.expects(:find_template).with("bar", %w(test/foo), false, [:key]).returns("template")
+    assert_equal "template", @template.refresh(@context)
+  end
+
+  def test_refresh_with_partials
+    @template = new_template("Hello", :virtual_path => "test/_foo")
+    @template.locals = [:key]
+    @context.lookup_context.expects(:find_template).with("foo", %w(test), true, [:key]).returns("partial")
+    assert_equal "partial", @template.refresh(@context)
+  end
+
+  def test_refresh_raises_an_error_without_virtual_path
+    @template = new_template("Hello", :virtual_path => nil)
+    assert_raise RuntimeError do
+      @template.refresh(@context)
+    end
+  end
+
+  def test_template_expire_sets_the_timestamp_to_1970
+    @template = new_template("Hello", :updated_at => Time.utc(2010))
+    assert_equal Time.utc(2010), @template.updated_at
+    @template.expire!
+    assert_equal Time.utc(1970), @template.updated_at
+  end
+
+  def test_template_rerender_renders_a_template_like_self
+    @template = new_template("Hello", :virtual_path => "test/foo_bar")
+    @context.expects(:render).with(:template => "test/foo_bar").returns("template")
+    assert_equal "template", @template.rerender(@context)
+  end
+
+  def test_template_rerender_renders_a_root_template_like_self
+    @template = new_template("Hello", :virtual_path => "foo_bar")
+    @context.expects(:render).with(:template => "foo_bar").returns("template")
+    assert_equal "template", @template.rerender(@context)
+  end
+
+  def test_template_rerender_renders_a_partial_like_self
+    @template = new_template("Hello", :virtual_path => "test/_foo_bar")
+    @context.expects(:render).with(:partial => "test/foo_bar").returns("partial")
+    assert_equal "partial", @template.rerender(@context)
+  end
+
+  def test_template_rerender_renders_a_root_partial_like_self
+    @template = new_template("Hello", :virtual_path => "_foo_bar")
+    @context.expects(:render).with(:partial => "foo_bar").returns("partial")
+    assert_equal "partial", @template.rerender(@context)
+  end
+
+  def test_rerender_raises_an_error_without_virtual_path
+    @template = new_template("Hello", :virtual_path => nil)
+    assert_raise RuntimeError do
+      @template.rerender(@context)
+    end
+  end
+
   if "ruby".encoding_aware?
     def test_resulting_string_is_utf8
       @template = new_template
@@ -89,12 +167,11 @@ class TestERBTemplate < ActiveSupport::TestCase
     # is set to something other than UTF-8, we don't
     # get any errors and get back a UTF-8 String.
     def test_default_external_works
-      Encoding.default_external = "ISO-8859-1"
-      @template = new_template("hello \xFCmlat")
-      assert_equal Encoding::UTF_8, render.encoding
-      assert_equal "hello \u{fc}mlat", render
-    ensure
-      Encoding.default_external = "UTF-8"
+      with_external_encoding "ISO-8859-1" do
+        @template = new_template("hello \xFCmlat")
+        assert_equal Encoding::UTF_8, render.encoding
+        assert_equal "hello \u{fc}mlat", render
+      end
     end
 
     def test_encoding_can_be_specified_with_magic_comment
@@ -108,14 +185,14 @@ class TestERBTemplate < ActiveSupport::TestCase
     # inside Rails.
     def test_lying_with_magic_comment
       assert_raises(ActionView::Template::Error) do
-        @template = new_template("# encoding: UTF-8\nhello \xFCmlat")
+        @template = new_template("# encoding: UTF-8\nhello \xFCmlat", :virtual_path => nil)
         render
       end
     end
 
     def test_encoding_can_be_specified_with_magic_comment_in_erb
       with_external_encoding Encoding::UTF_8 do
-        @template = new_template("<%# encoding: ISO-8859-1 %>hello \xFCmlat")
+        @template = new_template("<%# encoding: ISO-8859-1 %>hello \xFCmlat", :virtual_path => nil)
         result = render
         assert_equal Encoding::UTF_8, render.encoding
         assert_equal "hello \u{fc}mlat", render
@@ -124,16 +201,17 @@ class TestERBTemplate < ActiveSupport::TestCase
 
     def test_error_when_template_isnt_valid_utf8
       assert_raises(ActionView::Template::Error, /\xFC/) do
-        @template = new_template("hello \xFCmlat")
+        @template = new_template("hello \xFCmlat", :virtual_path => nil)
         render
       end
     end
 
     def with_external_encoding(encoding)
-      old, Encoding.default_external = Encoding.default_external, encoding
+      old = Encoding.default_external
+      silence_warnings { Encoding.default_external = encoding }
       yield
     ensure
-      Encoding.default_external = old
+      silence_warnings { Encoding.default_external = old }
     end
   end
-end
\ No newline at end of file
+end