Fix templates reloading in development when using custom view path [#2012 state:resolved]

2 files changed, 114 insertions, 40 deletions

diff --git a/actionpack/test/controller/view_paths_test.rb b/actionpack/test/controller/view_paths_test.rb
index 6468283270..8ea13fbe98 100644
--- a/actionpack/test/controller/view_paths_test.rb
+++ b/actionpack/test/controller/view_paths_test.rb
@@ -42,34 +42,30 @@ class ViewLoadPathsTest < ActionController::TestCase
     ActiveSupport::Deprecation.behavior = @old_behavior
   end
   
-  def assert_view_path_strings_are_equal(expected, actual)
-    assert_equal(expected.map {|path| path.sub(/\.\//, '')}, actual)
-  end
-
   def test_template_load_path_was_set_correctly
-    assert_view_path_strings_are_equal [FIXTURE_LOAD_PATH], @controller.view_paths.map(&:to_s)
+    assert_equal [FIXTURE_LOAD_PATH], @controller.view_paths.map(&:to_s)
   end
 
   def test_controller_appends_view_path_correctly
     @controller.append_view_path 'foo'
-    assert_view_path_strings_are_equal [FIXTURE_LOAD_PATH, 'foo'], @controller.view_paths.map(&:to_s)
+    assert_equal [FIXTURE_LOAD_PATH, 'foo'], @controller.view_paths.map(&:to_s)
 
     @controller.append_view_path(%w(bar baz))
-    assert_view_path_strings_are_equal [FIXTURE_LOAD_PATH, 'foo', 'bar', 'baz'], @controller.view_paths.map(&:to_s)
+    assert_equal [FIXTURE_LOAD_PATH, 'foo', 'bar', 'baz'], @controller.view_paths.map(&:to_s)
 
     @controller.append_view_path(FIXTURE_LOAD_PATH)
-    assert_view_path_strings_are_equal [FIXTURE_LOAD_PATH, 'foo', 'bar', 'baz', FIXTURE_LOAD_PATH], @controller.view_paths.map(&:to_s)
+    assert_equal [FIXTURE_LOAD_PATH, 'foo', 'bar', 'baz', FIXTURE_LOAD_PATH], @controller.view_paths.map(&:to_s)
   end
 
   def test_controller_prepends_view_path_correctly
     @controller.prepend_view_path 'baz'
-    assert_view_path_strings_are_equal ['baz', FIXTURE_LOAD_PATH], @controller.view_paths.map(&:to_s)
+    assert_equal ['baz', FIXTURE_LOAD_PATH], @controller.view_paths.map(&:to_s)
 
     @controller.prepend_view_path(%w(foo bar))
-    assert_view_path_strings_are_equal ['foo', 'bar', 'baz', FIXTURE_LOAD_PATH], @controller.view_paths.map(&:to_s)
+    assert_equal ['foo', 'bar', 'baz', FIXTURE_LOAD_PATH], @controller.view_paths.map(&:to_s)
 
     @controller.prepend_view_path(FIXTURE_LOAD_PATH)
-    assert_view_path_strings_are_equal [FIXTURE_LOAD_PATH, 'foo', 'bar', 'baz', FIXTURE_LOAD_PATH], @controller.view_paths.map(&:to_s)
+    assert_equal [FIXTURE_LOAD_PATH, 'foo', 'bar', 'baz', FIXTURE_LOAD_PATH], @controller.view_paths.map(&:to_s)
   end
 
   def test_template_appends_view_path_correctly
@@ -77,10 +73,10 @@ class ViewLoadPathsTest < ActionController::TestCase
     class_view_paths = TestController.view_paths
 
     @controller.append_view_path 'foo'
-    assert_view_path_strings_are_equal [FIXTURE_LOAD_PATH, 'foo'], @controller.view_paths.map(&:to_s)
+    assert_equal [FIXTURE_LOAD_PATH, 'foo'], @controller.view_paths.map(&:to_s)
 
     @controller.append_view_path(%w(bar baz))
-    assert_view_path_strings_are_equal [FIXTURE_LOAD_PATH, 'foo', 'bar', 'baz'], @controller.view_paths.map(&:to_s)
+    assert_equal [FIXTURE_LOAD_PATH, 'foo', 'bar', 'baz'], @controller.view_paths.map(&:to_s)
     assert_equal class_view_paths, TestController.view_paths
   end
 
@@ -89,10 +85,10 @@ class ViewLoadPathsTest < ActionController::TestCase
     class_view_paths = TestController.view_paths
 
     @controller.prepend_view_path 'baz'
-    assert_view_path_strings_are_equal ['baz', FIXTURE_LOAD_PATH], @controller.view_paths.map(&:to_s)
+    assert_equal ['baz', FIXTURE_LOAD_PATH], @controller.view_paths.map(&:to_s)
 
     @controller.prepend_view_path(%w(foo bar))
-    assert_view_path_strings_are_equal ['foo', 'bar', 'baz', FIXTURE_LOAD_PATH], @controller.view_paths.map(&:to_s)
+    assert_equal ['foo', 'bar', 'baz', FIXTURE_LOAD_PATH], @controller.view_paths.map(&:to_s)
     assert_equal class_view_paths, TestController.view_paths
   end
 
diff --git a/actionpack/test/template/compiled_templates_test.rb b/actionpack/test/template/compiled_templates_test.rb
index a8f8455a54..7d1d7634a8 100644
--- a/actionpack/test/template/compiled_templates_test.rb
+++ b/actionpack/test/template/compiled_templates_test.rb
@@ -5,18 +5,6 @@ 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
@@ -65,38 +53,124 @@ 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")
         end
-        reset_mtime_of('test/hello_world.erb')
         assert_equal "Hello world!", render(:file => "test/hello_world.erb")
       end
     end
   end
 
+  def test_template_becomes_missing_if_deleted_without_cached_template_loading
+    with_reloading(true) do
+      assert_equal 'Hello world!', render(:file => 'test/hello_world.erb')
+      delete_template 'test/hello_world.erb' do
+        assert_raise(ActionView::MissingTemplate) { render(:file => 'test/hello_world.erb') }
+      end
+      assert_equal 'Hello world!', render(:file => 'test/hello_world.erb')
+    end
+  end
+
+  def test_swapping_template_handler_is_working_without_cached_template_loading
+    with_reloading(true) do
+      assert_equal 'Hello world!', render(:file => 'test/hello_world')
+      delete_template 'test/hello_world.erb' do
+        rename_template 'test/hello_world_from_rxml.builder', 'test/hello_world.builder' do
+          assert_equal "<html>\n  <p>Hello</p>\n</html>\n", render(:file => 'test/hello_world')
+        end
+      end
+      assert_equal 'Hello world!', render(:file => 'test/hello_world')
+    end
+  end
+
+  def test_adding_localized_template_will_take_precedence_without_cached_template_loading
+    with_reloading(true) do
+      assert_equal 'Hello world!', render(:file => 'test/hello_world')
+      rename_template 'test/hello_world.da.html.erb', 'test/hello_world.en.html.erb' do
+        assert_equal 'Hey verden', render(:file => 'test/hello_world')
+      end
+    end
+  end
+
+  def test_deleting_localized_template_will_fall_back_to_non_localized_template_without_cached_template_loading
+    with_reloading(true) do
+      rename_template 'test/hello_world.da.html.erb', 'test/hello_world.en.html.erb' do
+        assert_equal 'Hey verden', render(:file => 'test/hello_world')
+        delete_template 'test/hello_world.en.html.erb' do
+          assert_equal 'Hello world!', render(:file => 'test/hello_world')
+        end
+        assert_equal 'Hey verden', render(:file => 'test/hello_world')
+      end
+    end
+  end
+
+  def test_parallel_reloadable_view_paths_are_working
+    with_reloading(true) do
+      view_paths_copy = new_reloadable_view_paths
+      assert_equal 'Hello world!', render(:file => 'test/hello_world')
+      with_view_paths(view_paths_copy, new_reloadable_view_paths) do
+        assert_equal 'Hello world!', render(:file => 'test/hello_world')
+      end
+      modify_template 'test/hello_world.erb', 'Goodbye world!' do
+        assert_equal 'Goodbye world!', render(:file => 'test/hello_world')
+        modify_template 'test/hello_world.erb', 'So long, world!' do
+          with_view_paths(view_paths_copy, new_reloadable_view_paths) do
+            assert_equal 'So long, world!', render(:file => 'test/hello_world')
+          end
+          assert_equal 'So long, world!', render(:file => 'test/hello_world')
+        end
+      end
+    end
+  end
+
   private
     def render(*args)
-      view_paths = ActionController::Base.view_paths
+      view_paths = @explicit_view_paths || ActionController::Base.view_paths
       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 
+    def with_view_paths(*args)
+      args.each do |view_paths|
+        begin
+          @explicit_view_paths = view_paths
+          yield
+        ensure
+          @explicit_view_paths = nil
+        end
       end
     end
 
-    def modify_template(template, content)
-      filename = "#{FIXTURE_LOAD_PATH}/#{template}"
+    def reset_mtime_of(template_name, view_paths_to_use)
+      view_paths_to_use.find_template(template_name).previously_last_modified = 10.seconds.ago unless ActionView::Base.cache_template_loading?
+    end
+
+    def modify_template(template, content, view_paths_to_use = ActionController::Base.view_paths)
+      filename = filename_for(template)
       old_content = File.read(filename)
       begin
         File.open(filename, "wb+") { |f| f.write(content) }
+        reset_mtime_of(template, view_paths_to_use)
         yield
       ensure
         File.open(filename, "wb+") { |f| f.write(old_content) }
+        reset_mtime_of(template, view_paths_to_use)
       end
     end
 
+    def filename_for(template)
+      File.join(FIXTURE_LOAD_PATH, template)
+    end
+
+    def rename_template(old_name, new_name)
+      File.rename(filename_for(old_name), filename_for(new_name))
+      yield
+    ensure
+      File.rename(filename_for(new_name), filename_for(old_name))
+    end
+
+    def delete_template(template, &block)
+      rename_template(template, File.join(File.dirname(template), "__#{File.basename(template)}"), &block)
+    end
+
     def with_caching(perform_caching)
       old_perform_caching = ActionController::Base.perform_caching
       begin
@@ -107,19 +181,23 @@ class CompiledTemplatesTest < Test::Unit::TestCase
       end
     end
 
-    def with_reloading(reload_templates)
-      old_view_paths, old_cache_templates = ActionController::Base.view_paths, ActionView::Base.cache_template_loading
+    def with_reloading(reload_templates, view_paths_owner = ActionController::Base)
+      old_view_paths, old_cache_templates = view_paths_owner.view_paths, ActionView::Base.cache_template_loading
       begin
         ActionView::Base.cache_template_loading = !reload_templates
-        ActionController::Base.view_paths = view_paths_for(reload_templates)
+        view_paths_owner.view_paths = view_paths_for(reload_templates)
         yield
       ensure
-        ActionController::Base.view_paths, ActionView::Base.cache_template_loading = old_view_paths, old_cache_templates
+        view_paths_owner.view_paths, ActionView::Base.cache_template_loading = old_view_paths, old_cache_templates
       end
     end
 
+    def new_reloadable_view_paths
+      ActionView::PathSet.new(CACHED_VIEW_PATHS.map(&:to_s))
+    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
+      reload_templates ? new_reloadable_view_paths : CACHED_VIEW_PATHS
     end
 end