Port fast reloadable templates from rails-dev-boost.

1 files changed, 29 insertions, 15 deletions

diff --git a/actionpack/test/template/compiled_templates_test.rb b/actionpack/test/template/compiled_templates_test.rb
index 55fa346fb8..a8f8455a54 100644
--- a/actionpack/test/template/compiled_templates_test.rb
+++ b/actionpack/test/template/compiled_templates_test.rb
@@ -2,8 +2,21 @@ require 'abstract_unit'
 require 'controller/fake_models'
 
 class CompiledTemplatesTest < Test::Unit::TestCase
+  
   def setup
     @compiled_templates = ActionView::Base::CompiledTemplates
+
+    # first, if we are running the whole test suite with ReloadableTemplates
+    # try to undef all the methods through ReloadableTemplate's interfaces
+    unless ActionView::Base.cache_template_loading?
+      ActionController::Base.view_paths.each do |view_path|
+        view_path.paths.values.uniq!.each do |reloadable_template|
+          reloadable_template.undef_my_compiled_methods!
+        end
+      end
+    end
+
+    # just purge anything that's left
     @compiled_templates.instance_methods.each do |m|
       @compiled_templates.send(:remove_method, m) if m =~ /^_run_/
     end
@@ -35,17 +48,6 @@ class CompiledTemplatesTest < Test::Unit::TestCase
     end
   end
 
-  def test_compiled_template_will_always_be_recompiled_when_template_is_not_cached
-    with_caching(false) do
-      ActionView::Template.any_instance.expects(:recompile?).times(3).returns(true)
-      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)
-      3.times { assert_equal "Hello world!", render(:file => "#{FIXTURE_LOAD_PATH}/test/hello_world.erb") }
-      assert_equal 1, @compiled_templates.instance_methods.size
-    end
-  end
-
   def test_template_changes_are_not_reflected_with_cached_template_loading
     with_caching(true) do
       with_reloading(false) do
@@ -63,9 +65,10 @@ class CompiledTemplatesTest < Test::Unit::TestCase
       with_reloading(true) do
         assert_equal "Hello world!", render(:file => "test/hello_world.erb")
         modify_template "test/hello_world.erb", "Goodbye world!" do
+          reset_mtime_of('test/hello_world.erb')
           assert_equal "Goodbye world!", render(:file => "test/hello_world.erb")
-          sleep(1) # Need to sleep so that the timestamp actually changes
         end
+        reset_mtime_of('test/hello_world.erb')
         assert_equal "Hello world!", render(:file => "test/hello_world.erb")
       end
     end
@@ -74,10 +77,15 @@ class CompiledTemplatesTest < Test::Unit::TestCase
   private
     def render(*args)
       view_paths = ActionController::Base.view_paths
-      assert_equal ActionView::Template::Path, view_paths.first.class
       ActionView::Base.new(view_paths, {}).render(*args)
     end
 
+    def reset_mtime_of(template_name)
+      unless ActionView::Base.cache_template_loading?
+        ActionController::Base.view_paths.find_template(template_name).previously_last_modified = 10.seconds.ago 
+      end
+    end
+
     def modify_template(template, content)
       filename = "#{FIXTURE_LOAD_PATH}/#{template}"
       old_content = File.read(filename)
@@ -100,12 +108,18 @@ class CompiledTemplatesTest < Test::Unit::TestCase
     end
 
     def with_reloading(reload_templates)
-      old_cache_template_loading = ActionView::Base.cache_template_loading
+      old_view_paths, old_cache_templates = ActionController::Base.view_paths, ActionView::Base.cache_template_loading
       begin
         ActionView::Base.cache_template_loading = !reload_templates
+        ActionController::Base.view_paths = view_paths_for(reload_templates)
         yield
       ensure
-        ActionView::Base.cache_template_loading = old_cache_template_loading
+        ActionController::Base.view_paths, ActionView::Base.cache_template_loading = old_view_paths, old_cache_templates
       end
     end
+
+    def view_paths_for(reload_templates)
+      # reloadable paths are cheap to create
+      reload_templates ? ActionView::PathSet.new(CACHED_VIEW_PATHS.map(&:to_s)) : CACHED_VIEW_PATHS
+    end
 end