Merge pull request #36576 from mtsmfm/mtsmfm/fix-fixture-resolver

Support :any variants for ActionView::FixtureResolver

1 files changed, 22 insertions, 0 deletions

diff --git a/actionview/test/template/testing/fixture_resolver_test.rb b/actionview/test/template/testing/fixture_resolver_test.rb
index 6d0317e0c9..a6066e94c6 100644
--- a/actionview/test/template/testing/fixture_resolver_test.rb
+++ b/actionview/test/template/testing/fixture_resolver_test.rb
@@ -27,4 +27,26 @@ class FixtureResolverTest < ActiveSupport::TestCase
     assert_equal :html,           templates.first.format
     assert_equal "variant",       templates.first.variant
   end
+
+  def test_should_match_locales
+    resolver = ActionView::FixtureResolver.new("arbitrary/path.erb" => "this text", "arbitrary/path.fr.erb" => "ce texte")
+    en = resolver.find_all("path", "arbitrary", false, locale: [:en], formats: [:html], variants: [], handlers: [:erb])
+    fr = resolver.find_all("path", "arbitrary", false, locale: [:fr], formats: [:html], variants: [], handlers: [:erb])
+
+    assert_equal 1, en.size
+    assert_equal 2, fr.size
+
+    assert_equal "this text", en[0].source
+    assert_equal "ce texte",  fr[0].source
+    assert_equal "this text", fr[1].source
+  end
+
+  def test_should_return_all_variants_for_any
+    resolver = ActionView::FixtureResolver.new("arbitrary/path.html.erb" => "this html", "arbitrary/path.html+varient.erb" => "this text")
+    templates = resolver.find_all("path", "arbitrary", false, locale: [], formats: [:html], variants: [], handlers: [:erb])
+    assert_equal 1, templates.size, "expected one template"
+    assert_equal "this html", templates.first.source
+    templates = resolver.find_all("path", "arbitrary", false, locale: [], formats: [:html], variants: :any, handlers: [:erb])
+    assert_equal 2, templates.size, "expected all templates"
+  end
 end