Tag factories

test/controllers/old_node_controller_test.rb

@@ -86,12 +86,13 @@ def test_version
     basic_authorization(users(:public_user).email, "test")
 
     # setup a simple XML node
+    create_list(:node_tag, 2, :node => current_nodes(:node_with_versions))
     xml_doc = current_nodes(:node_with_versions).to_xml
     xml_node = xml_doc.find("//osm/node").first
     nodeid = current_nodes(:node_with_versions).id
 
-    # Ensure that the current tags are propogated to the history too
-    propogate_tags(current_nodes(:node_with_versions), nodes(:node_with_versions_v4))
+    # Ensure that the current tags are propagated to the history too
+    propagate_tags(current_nodes(:node_with_versions), nodes(:node_with_versions_v4))
 
     # keep a hash of the versions => string, as we'll need something
     # to test against later
@@ -164,11 +165,16 @@ def check_not_found_id_version(id, version)
   # Test that getting the current version is identical to picking
   # that version with the version URI call.
   def test_current_version
-    propogate_tags(current_nodes(:visible_node), nodes(:visible_node))
-    propogate_tags(current_nodes(:used_node_1), nodes(:used_node_1))
-    propogate_tags(current_nodes(:used_node_2), nodes(:used_node_2))
-    propogate_tags(current_nodes(:node_used_by_relationship), nodes(:node_used_by_relationship))
-    propogate_tags(current_nodes(:node_with_versions), nodes(:node_with_versions_v4))
+    create(:node_tag, :node => current_nodes(:visible_node))
+    create(:node_tag, :node => current_nodes(:used_node_1))
+    create(:node_tag, :node => current_nodes(:used_node_2))
+    create(:node_tag, :node => current_nodes(:node_used_by_relationship))
+    create(:node_tag, :node => current_nodes(:node_with_versions))
+    propagate_tags(current_nodes(:visible_node), nodes(:visible_node))
+    propagate_tags(current_nodes(:used_node_1), nodes(:used_node_1))
+    propagate_tags(current_nodes(:used_node_2), nodes(:used_node_2))
+    propagate_tags(current_nodes(:node_used_by_relationship), nodes(:node_used_by_relationship))
+    propagate_tags(current_nodes(:node_with_versions), nodes(:node_with_versions_v4))
 
     check_current_version(current_nodes(:visible_node))
     check_current_version(current_nodes(:used_node_1))
@@ -387,7 +393,7 @@ def precision(f)
     (f * GeoRecord::SCALE).round.to_f / GeoRecord::SCALE
   end
 
-  def propogate_tags(node, old_node)
+  def propagate_tags(node, old_node)
     node.tags.each do |k, v|
       create(:old_node_tag, :old_node => old_node, :k => k, :v => v)
     end

test/controllers/old_way_controller_test.rb

@@ -46,9 +46,12 @@ def test_history_invalid
   ##
   # check that we can retrieve versions of a way
   def test_version
-    propogate_tags(current_ways(:visible_way), ways(:visible_way))
-    propogate_tags(current_ways(:used_way), ways(:used_way))
-    propogate_tags(current_ways(:way_with_versions), ways(:way_with_versions_v4))
+    create(:way_tag, :way => current_ways(:visible_way))
+    create(:way_tag, :way => current_ways(:used_way))
+    create(:way_tag, :way => current_ways(:way_with_versions))
+    propagate_tags(current_ways(:visible_way), ways(:visible_way))
+    propagate_tags(current_ways(:used_way), ways(:used_way))
+    propagate_tags(current_ways(:way_with_versions), ways(:way_with_versions_v4))
 
     check_current_version(current_ways(:visible_way).id)
     check_current_version(current_ways(:used_way).id)
@@ -281,7 +284,7 @@ def do_redact_way(way, redaction)
     post :redact, :id => way.way_id, :version => way.version, :redaction => redaction.id
   end
 
-  def propogate_tags(way, old_way)
+  def propagate_tags(way, old_way)
     way.tags.each do |k, v|
       create(:old_way_tag, :old_way => old_way, :k => k, :v => v)
     end