1 files changed, 42 insertions, 3 deletions
diff --git a/actionpack/test/template/compiled_templates_test.rb b/actionpack/test/template/compiled_templates_test.rb
index f7688b2072..a68b09bb45 100644
--- a/actionpack/test/template/compiled_templates_test.rb
+++ b/actionpack/test/template/compiled_templates_test.rb
@@ -30,8 +30,8 @@ uses_mocha 'TestTemplateRecompilation' do
       assert_equal "Hello world!", render(:file => "test/hello_world.erb")
     end
 
-    def test_compiled_template_will_always_be_recompiled_when_eager_loaded_templates_is_off
-      ActionView::PathSet::Path.expects(:eager_load_templates?).times(4).returns(false)
+    def test_compiled_template_will_always_be_recompiled_when_template_is_not_cached
+      ActionView::Template.any_instance.expects(:loaded?).times(3).returns(false)
       assert_equal 0, @compiled_templates.instance_methods.size
       assert_equal "Hello world!", render(:file => "#{FIXTURE_LOAD_PATH}/test/hello_world.erb")
       ActionView::Template.any_instance.expects(:compile!).times(3)
@@ -39,9 +39,48 @@ uses_mocha 'TestTemplateRecompilation' do
       assert_equal 1, @compiled_templates.instance_methods.size
     end
 
+    def test_template_changes_are_not_reflected_with_cached_templates
+      assert_equal "Hello world!", render(:file => "test/hello_world.erb")
+      modify_template "test/hello_world.erb", "Goodbye world!" do
+        assert_equal "Hello world!", render(:file => "test/hello_world.erb")
+      end
+      assert_equal "Hello world!", render(:file => "test/hello_world.erb")
+    end
+
+    def test_template_changes_are_reflected_with_uncached_templates
+      assert_equal "Hello world!", render_without_cache(:file => "test/hello_world.erb")
+      modify_template "test/hello_world.erb", "Goodbye world!" do
+        assert_equal "Goodbye world!", render_without_cache(:file => "test/hello_world.erb")
+      end
+      assert_equal "Hello world!", render_without_cache(:file => "test/hello_world.erb")
+    end
+
     private
       def render(*args)
-        ActionView::Base.new(ActionController::Base.view_paths, {}).render(*args)
+        render_with_cache(*args)
+      end
+
+      def render_with_cache(*args)
+        view_paths = ActionController::Base.view_paths
+        assert view_paths.first.loaded?
+        ActionView::Base.new(view_paths, {}).render(*args)
+      end
+
+      def render_without_cache(*args)
+        view_paths = ActionView::Base.process_view_paths(FIXTURE_LOAD_PATH)
+        assert !view_paths.first.loaded?
+        ActionView::Base.new(view_paths, {}).render(*args)
+      end
+
+      def modify_template(template, content)
+        filename = "#{FIXTURE_LOAD_PATH}/#{template}"
+        old_content = File.read(filename)
+        begin
+          File.open(filename, "wb+") { |f| f.write(content) }
+          yield
+        ensure
+          File.open(filename, "wb+") { |f| f.write(old_content) }
+        end
       end
   end
 end