1 files changed, 76 insertions, 10 deletions
diff --git a/actionpack/test/controller/render_test.rb b/actionpack/test/controller/render_test.rb
index f42efd35af..e56f6e840a 100644
--- a/actionpack/test/controller/render_test.rb
+++ b/actionpack/test/controller/render_test.rb
@@ -2,6 +2,9 @@ require 'abstract_unit'
 require 'controller/fake_models'
 
 class TestControllerWithExtraEtags < ActionController::Base
+  def self.controller_name; 'test'; end
+  def self.controller_path; 'test'; end
+
   etag { nil  }
   etag { 'ab' }
   etag { :cde }
@@ -17,7 +20,7 @@ class TestControllerWithExtraEtags < ActionController::Base
   end
 
   def strong
-    render plain: "stale" if stale?(strong_etag: 'strong')
+    render plain: "stale" if stale?(strong_etag: 'strong', template: false)
   end
 
   def with_template
@@ -25,6 +28,10 @@ class TestControllerWithExtraEtags < ActionController::Base
       render plain: 'stale'
     end
   end
+
+  def with_implicit_template
+    fresh_when(etag: '123')
+  end
 end
 
 class ImplicitRenderTestController < ActionController::Base
@@ -35,6 +42,14 @@ class ImplicitRenderTestController < ActionController::Base
   end
 end
 
+module Namespaced
+  class ImplicitRenderTestController < ActionController::Base
+    def hello_world
+      fresh_when(etag: 'abc')
+    end
+  end
+end
+
 class TestController < ActionController::Base
   protect_from_forgery
 
@@ -251,6 +266,19 @@ class TestController < ActionController::Base
     end
 end
 
+module TemplateModificationHelper
+  private
+    def modify_template(name)
+      path = File.expand_path("../../fixtures/#{name}.erb", __FILE__)
+      original = File.read(path)
+      File.write(path, "#{original} Modified!")
+      ActionView::LookupContext::DetailsKey.clear
+      yield
+    ensure
+      File.write(path, original)
+    end
+end
+
 class MetalTestController < ActionController::Metal
   include AbstractController::Rendering
   include ActionView::Rendering
@@ -480,6 +508,7 @@ end
 
 class EtagRenderTest < ActionController::TestCase
   tests TestControllerWithExtraEtags
+  include TemplateModificationHelper
 
   def test_strong_etag
     @request.if_none_match = strong_etag(['strong', 'ab', :cde, [:f]])
@@ -528,20 +557,28 @@ class EtagRenderTest < ActionController::TestCase
     get :with_template
     assert_response :not_modified
 
-    # Modify the template digest
-    path = File.expand_path('../../fixtures/test/hello_world.erb', __FILE__)
-    old = File.read(path)
+    modify_template("test/hello_world") do
+      request.if_none_match = etag
+      get :with_template
+      assert_response :ok
+      assert_not_equal etag, @response.etag
+    end
+  end
 
-    begin
-      File.write path, 'foo'
-      ActionView::LookupContext::DetailsKey.clear
+  def test_etag_reflects_implicit_template_digest
+    get :with_implicit_template
+    assert_response :ok
+    assert_not_nil etag = @response.etag
 
+    request.if_none_match = etag
+    get :with_implicit_template
+    assert_response :not_modified
+
+    modify_template("test/with_implicit_template") do
       request.if_none_match = etag
-      get :with_template
+      get :with_implicit_template
       assert_response :ok
       assert_not_equal etag, @response.etag
-    ensure
-      File.write path, old
     end
   end
 
@@ -555,6 +592,28 @@ class EtagRenderTest < ActionController::TestCase
     end
 end
 
+class NamespacedEtagRenderTest < ActionController::TestCase
+  tests Namespaced::ImplicitRenderTestController
+  include TemplateModificationHelper
+
+  def test_etag_reflects_template_digest
+    get :hello_world
+    assert_response :ok
+    assert_not_nil etag = @response.etag
+
+    request.if_none_match = etag
+    get :hello_world
+    assert_response :not_modified
+
+    modify_template("namespaced/implicit_render_test/hello_world") do
+      request.if_none_match = etag
+      get :hello_world
+      assert_response :ok
+      assert_not_equal etag, @response.etag
+    end
+  end
+end
+
 class MetalRenderTest < ActionController::TestCase
   tests MetalTestController
 
@@ -564,6 +623,13 @@ class MetalRenderTest < ActionController::TestCase
   end
 end
 
+class ActionControllerBaseRenderTest < ActionController::TestCase
+  def test_direct_render_to_string
+    ac = ActionController::Base.new()
+    assert_equal "Hello world!", ac.render_to_string(template: 'test/hello_world')
+  end
+end
+
 class ImplicitRenderTest < ActionController::TestCase
   tests ImplicitRenderTestController