Merge remote-tracking branch 'upstream/pull/5153'

[rails.git] / test / lib / osm_community_index_test.rb

diff --git a/test/lib/osm_community_index_test.rb b/test/lib/osm_community_index_test.rb
index 9abb61c3773cddb99510b907fe517b40bf8d6178..a922d7fd9965613b306fe7931999cf28ddd55933 100644 (file)
--- a/test/lib/osm_community_index_test.rb
+++ b/test/lib/osm_community_index_test.rb
@@ -5,8 +5,9 @@ class CountryTest < ActiveSupport::TestCase
     # If there is no translations and no name for the chapter, use the community name
     community = Community.new({ "id" => "foo-chapter", "type" => "osm-lc", "strings" => { "community" => "Community Name" } })
     community_locale_yaml = {}
+    community_en_yaml = {}
 
-    name = OsmCommunityIndex.resolve_name(community, community_locale_yaml)
+    name = OsmCommunityIndex.resolve_name(community, community_locale_yaml, community_en_yaml)
     assert_equal("Community Name", name)
   end
 
@@ -14,8 +15,9 @@ class CountryTest < ActiveSupport::TestCase
     # If there is a name for the chapter, prefer that to the community name
     community = Community.new({ "id" => "foo-chapter", "type" => "osm-lc", "strings" => { "community" => "Community Name", "name" => "Chapter Name" } })
     community_locale_yaml = {}
+    community_en_yaml = {}
 
-    name = OsmCommunityIndex.resolve_name(community, community_locale_yaml)
+    name = OsmCommunityIndex.resolve_name(community, community_locale_yaml, community_en_yaml)
     assert_equal("Chapter Name", name)
   end
 
@@ -23,8 +25,9 @@ class CountryTest < ActiveSupport::TestCase
     # If there is an explicitly translated name for the chapter, use that
     community = Community.new({ "id" => "foo-chapter", "type" => "osm-lc", "strings" => { "community" => "Community Name", "name" => "Chapter Name" } })
     community_locale_yaml = { "foo-chapter" => { "name" => "Translated Chapter Name" } }
+    community_en_yaml = {}
 
-    name = OsmCommunityIndex.resolve_name(community, community_locale_yaml)
+    name = OsmCommunityIndex.resolve_name(community, community_locale_yaml, community_en_yaml)
     assert_equal("Translated Chapter Name", name)
   end
 
@@ -32,8 +35,9 @@ class CountryTest < ActiveSupport::TestCase
     # If there's no explicitly translated name for the chapter, use the default name and interpolate the community name if required.
     community = Community.new({ "id" => "foo-chapter", "type" => "osm-lc", "strings" => { "community" => "Community Name", "communityID" => "communityname" } })
     community_locale_yaml = { "_communities" => { "communityname" => "Translated Community" }, "_defaults" => { "osm-lc" => { "name" => "{community} Chapter" } } }
+    community_en_yaml = {}
 
-    name = OsmCommunityIndex.resolve_name(community, community_locale_yaml)
+    name = OsmCommunityIndex.resolve_name(community, community_locale_yaml, community_en_yaml)
     assert_equal("Translated Community Chapter", name)
   end
 end