4 files changed, 177 insertions, 19 deletions
diff --git a/actionview/test/template/file_system_resolver_test.rb b/actionview/test/template/file_system_resolver_test.rb
new file mode 100644
index 0000000000..aa03fdcb13
--- /dev/null
+++ b/actionview/test/template/file_system_resolver_test.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+require "abstract_unit"
+require "template/resolver_shared_tests"
+
+class FileSystemResolverTest < ActiveSupport::TestCase
+  include ResolverSharedTests
+
+  def resolver
+    ActionView::FileSystemResolver.new(tmpdir)
+  end
+end
diff --git a/actionview/test/template/optimized_file_system_resolver_test.rb b/actionview/test/template/optimized_file_system_resolver_test.rb
new file mode 100644
index 0000000000..c0c64357ce
--- /dev/null
+++ b/actionview/test/template/optimized_file_system_resolver_test.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+require "abstract_unit"
+require "template/resolver_shared_tests"
+
+class OptimizedFileSystemResolverTest < ActiveSupport::TestCase
+  include ResolverSharedTests
+
+  def resolver
+    ActionView::OptimizedFileSystemResolver.new(tmpdir)
+  end
+end
diff --git a/actionview/test/template/resolver_shared_tests.rb b/actionview/test/template/resolver_shared_tests.rb
new file mode 100644
index 0000000000..8b47c5bc89
--- /dev/null
+++ b/actionview/test/template/resolver_shared_tests.rb
@@ -0,0 +1,148 @@
+# frozen_string_literal: true
+
+module ResolverSharedTests
+  attr_reader :tmpdir
+
+  def run(*args)
+    capture_exceptions do
+      Dir.mktmpdir(nil, __dir__) { |dir| @tmpdir = dir; super }
+    end
+  end
+
+  def with_file(filename, source = "File at #{filename}")
+    path = File.join(tmpdir, filename)
+    FileUtils.mkdir_p(File.dirname(path))
+    File.write(path, source)
+  end
+
+  def context
+    @context ||= ActionView::LookupContext.new(resolver)
+  end
+
+  def test_can_find_with_no_extensions
+    with_file "test/hello_world", "Hello default!"
+
+    templates = resolver.find_all("hello_world", "test", false, locale: [:en], formats: [:html], variants: [:phone], handlers: [:erb])
+    assert_equal 1, templates.size
+    assert_equal "Hello default!",   templates[0].source
+    assert_equal "test/hello_world", templates[0].virtual_path
+    assert_nil templates[0].format
+    assert_nil templates[0].variant
+    assert_kind_of ActionView::Template::Handlers::Raw, templates[0].handler
+  end
+
+  def test_can_find_with_just_handler
+    with_file "test/hello_world.erb", "Hello erb!"
+
+    templates = resolver.find_all("hello_world", "test", false, locale: [:en], formats: [:html], variants: [:phone], handlers: [:erb])
+    assert_equal 1, templates.size
+    assert_equal "Hello erb!",   templates[0].source
+    assert_equal "test/hello_world", templates[0].virtual_path
+    assert_nil templates[0].format
+    assert_nil templates[0].variant
+    assert_kind_of ActionView::Template::Handlers::ERB, templates[0].handler
+  end
+
+  def test_can_find_with_format_and_handler
+    with_file "test/hello_world.text.builder", "Hello plain text!"
+
+    templates = resolver.find_all("hello_world", "test", false, locale: [:en], formats: [:html, :text], variants: [:phone], handlers: [:erb, :builder])
+    assert_equal 1, templates.size
+    assert_equal "Hello plain text!", templates[0].source
+    assert_equal "test/hello_world",  templates[0].virtual_path
+    assert_equal :text, templates[0].format
+    assert_nil templates[0].variant
+    assert_kind_of ActionView::Template::Handlers::Builder, templates[0].handler
+  end
+
+  def test_can_find_with_variant_format_and_handler
+    with_file "test/hello_world.html+phone.erb", "Hello plain text!"
+
+    templates = resolver.find_all("hello_world", "test", false, locale: [:en], formats: [:html], variants: [:phone], handlers: [:erb])
+    assert_equal 1, templates.size
+    assert_equal "Hello plain text!", templates[0].source
+    assert_equal "test/hello_world",  templates[0].virtual_path
+    assert_equal :html, templates[0].format
+    assert_equal "phone", templates[0].variant
+    assert_kind_of ActionView::Template::Handlers::ERB, templates[0].handler
+  end
+
+  def test_can_find_with_any_variant_format_and_handler
+    with_file "test/hello_world.html+phone.erb", "Hello plain text!"
+
+    templates = resolver.find_all("hello_world", "test", false, locale: [:en], formats: [:html], variants: :any, handlers: [:erb])
+    assert_equal 1, templates.size
+    assert_equal "Hello plain text!", templates[0].source
+    assert_equal "test/hello_world",  templates[0].virtual_path
+    assert_equal :html, templates[0].format
+    assert_equal "phone", templates[0].variant
+    assert_kind_of ActionView::Template::Handlers::ERB, templates[0].handler
+  end
+
+  def test_doesnt_find_template_with_wrong_details
+    with_file "test/hello_world.html.erb", "Hello plain text!"
+
+    templates = resolver.find_all("hello_world", "test", false, locale: [], formats: [:xml], variants: :any, handlers: [:builder])
+    assert_equal 0, templates.size
+
+    templates = resolver.find_all("hello_world", "test", false, locale: [], formats: [:xml], variants: :any, handlers: [:erb])
+    assert_equal 0, templates.size
+  end
+
+  def test_found_template_is_cached
+    with_file "test/hello_world.html.erb", "Hello HTML!"
+
+    a = context.find("hello_world", "test", false, [], {})
+    b = context.find("hello_world", "test", false, [], {})
+    assert_same a, b
+  end
+
+  def test_different_templates_when_cache_disabled
+    with_file "test/hello_world.html.erb", "Hello HTML!"
+
+    a = context.find("hello_world", "test", false, [], {})
+    b = context.disable_cache { context.find("hello_world", "test", false, [], {}) }
+    c = context.find("hello_world", "test", false, [], {})
+
+    # disable_cache should give us a new object
+    assert_not_same a, b
+
+    # but it should not clear the cache
+    assert_same a, c
+  end
+
+  def test_same_template_from_different_details_is_same_object
+    with_file "test/hello_world.html.erb", "Hello HTML!"
+
+    a = context.find("hello_world", "test", false, [], locale: [:en])
+    b = context.find("hello_world", "test", false, [], locale: [:fr])
+    assert_same a, b
+  end
+
+  def test_templates_with_optional_locale_shares_common_object
+    with_file "test/hello_world.text.erb", "Generic plain text!"
+    with_file "test/hello_world.fr.text.erb", "Texte en Francais!"
+
+    en = context.find_all("hello_world", "test", false, [], locale: [:en])
+    fr = context.find_all("hello_world", "test", false, [], locale: [:fr])
+
+    assert_equal 1, en.size
+    assert_equal 2, fr.size
+
+    assert_equal "Generic plain text!", en[0].source
+    assert_equal "Texte en Francais!",  fr[0].source
+    assert_equal "Generic plain text!", fr[1].source
+
+    assert_same en[0], fr[1]
+  end
+
+  def test_virtual_path_is_preserved_with_dot
+    with_file "test/hello_world.html.erb", "Hello html!"
+
+    template = context.find("hello_world.html", "test", false, [], {})
+    assert_equal "test/hello_world.html", template.virtual_path
+
+    template = context.find("hello_world", "test", false, [], {})
+    assert_equal "test/hello_world", template.virtual_path
+  end
+end
diff --git a/actionview/test/template/template_test.rb b/actionview/test/template/template_test.rb
index 71fb99115b..049e0bc129 100644
--- a/actionview/test/template/template_test.rb
+++ b/actionview/test/template/template_test.rb
@@ -91,10 +91,10 @@ class TestERBTemplate < ActiveSupport::TestCase
     assert_equal "<%= hello %>", render
   end
 
-  def test_template_loses_its_source_after_rendering
+  def test_template_does_not_lose_its_source_after_rendering
     @template = new_template
     render
-    assert_nil @template.source
+    assert_equal "<%= hello %>", @template.source
   end
 
   def test_template_does_not_lose_its_source_after_rendering_if_it_does_not_have_a_virtual_path
@@ -121,24 +121,10 @@ class TestERBTemplate < ActiveSupport::TestCase
     assert_equal "hellopartialhello", render
   end
 
-  def test_refresh_with_templates
+  def test_refresh_is_deprecated
     @template = new_template("Hello", virtual_path: "test/foo/bar", locals: [:key])
-    assert_called_with(@context.lookup_context, :find_template, ["bar", %w(test/foo), false, [:key]], returns: "template") do
-      assert_equal "template", @template.refresh(@context)
-    end
-  end
-
-  def test_refresh_with_partials
-    @template = new_template("Hello", virtual_path: "test/_foo", locals: [:key])
-    assert_called_with(@context.lookup_context, :find_template, ["foo", %w(test), true, [:key]], returns: "partial") do
-      assert_equal "partial", @template.refresh(@context)
-    end
-  end
-
-  def test_refresh_raises_an_error_without_virtual_path
-    @template = new_template("Hello", virtual_path: nil)
-    assert_raise RuntimeError do
-      @template.refresh(@context)
+    assert_deprecated do
+      assert_same @template, @template.refresh(@context)
     end
   end