Get rid of hardwired counts in assertions

[rails.git] / test / controllers / old_node_controller_test.rb

diff --git a/test/controllers/old_node_controller_test.rb b/test/controllers/old_node_controller_test.rb
index 1fa82717ab10391e113cabcd6727efd8ea09df9b..181d132917a73d3b2a8d43789298b450f1537fab 100644 (file)
--- a/test/controllers/old_node_controller_test.rb
+++ b/test/controllers/old_node_controller_test.rb
@@ -86,12 +86,13 @@ class OldNodeControllerTest < ActionController::TestCase
     basic_authorization(users(:public_user).email, "test")
 
     # setup a simple XML node
     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
 
     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
 
     # keep a hash of the versions => string, as we'll need something
     # to test against later


@@ -164,11 +165,16 @@ class OldNodeControllerTest < ActionController::TestCase
   # Test that getting the current version is identical to picking
   # that version with the version URI call.
   def test_current_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))
 
     check_current_version(current_nodes(:visible_node))
     check_current_version(current_nodes(:used_node_1))


@@ -387,7 +393,7 @@ class OldNodeControllerTest < ActionController::TestCase
     (f * GeoRecord::SCALE).round.to_f / GeoRecord::SCALE
   end
 
     (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
     node.tags.each do |k, v|
       create(:old_node_tag, :old_node => old_node, :k => k, :v => v)
     end