Merge remote-tracking branch 'openstreetmap/pull/1492'

[rails.git] / test / models / node_test.rb

diff --git a/test/models/node_test.rb b/test/models/node_test.rb
index 247707214c71c9209b514de29911bdadd111c699..85bdfc99559a60f4805f83d7625eb6c7ea8b3dad 100644 (file)
--- a/test/models/node_test.rb
+++ b/test/models/node_test.rb
@@ -1,10 +1,10 @@
-require 'test_helper'
+require "test_helper"

 
 class NodeTest < ActiveSupport::TestCase
   api_fixtures
 
   def test_node_count
 
 class NodeTest < ActiveSupport::TestCase
   api_fixtures
 
   def test_node_count

-    assert_equal 18, Node.count
+    assert_equal 19, Node.count

   end
 
   def test_node_too_far_north
   end
 
   def test_node_too_far_north


@@ -84,7 +84,7 @@ class NodeTest < ActiveSupport::TestCase
       :visible => 1,
       :version => 1
     )
       :visible => 1,
       :version => 1
     )

-    assert node_template.create_with_history(users(:normal_user))
+    assert node_template.create_with_history(changesets(:normal_user_first_change).user)

 
     node = Node.find(node_template.id)
     assert_not_nil node
 
     node = Node.find(node_template.id)
     assert_not_nil node


@@ -116,7 +116,7 @@ class NodeTest < ActiveSupport::TestCase
     node_template.latitude = 12.3456
     node_template.longitude = 65.4321
     # node_template.tags = "updated=yes"
     node_template.latitude = 12.3456
     node_template.longitude = 65.4321
     # node_template.tags = "updated=yes"

-    assert node.update_from(node_template, users(:normal_user))
+    assert node.update_from(node_template, current_nodes(:visible_node).changeset.user)

 
     node = Node.find(node_template.id)
     assert_not_nil node
 
     node = Node.find(node_template.id)
     assert_not_nil node


@@ -144,7 +144,7 @@ class NodeTest < ActiveSupport::TestCase
     node = Node.find(node_template.id)
     assert_not_nil node
 
     node = Node.find(node_template.id)
     assert_not_nil node
 

-    assert node.delete_with_history!(node_template, users(:normal_user))
+    assert node.delete_with_history!(node_template, current_nodes(:visible_node).changeset.user)

 
     node = Node.find(node_template.id)
     assert_not_nil node
 
     node = Node.find(node_template.id)
     assert_not_nil node


@@ -271,11 +271,11 @@ class NodeTest < ActiveSupport::TestCase
     message_create = assert_raise(OSM::APIBadXMLError) do
       Node.from_xml(no_node, true)
     end
     message_create = assert_raise(OSM::APIBadXMLError) do
       Node.from_xml(no_node, true)
     end

-    assert_match /XML doesn't contain an osm\/node element/, message_create.message
+    assert_match %r{XML doesn't contain an osm/node element}, message_create.message

     message_update = assert_raise(OSM::APIBadXMLError) do
       Node.from_xml(no_node, false)
     end
     message_update = assert_raise(OSM::APIBadXMLError) do
       Node.from_xml(no_node, false)
     end

-    assert_match /XML doesn't contain an osm\/node element/, message_update.message
+    assert_match %r{XML doesn't contain an osm/node element}, message_update.message

   end
 
   def test_from_xml_no_k_v
   end
 
   def test_from_xml_no_k_v


@@ -316,20 +316,23 @@ class NodeTest < ActiveSupport::TestCase
 
   def test_node_tags
     node = current_nodes(:node_with_versions)
 
   def test_node_tags
     node = current_nodes(:node_with_versions)

+    taglist = create_list(:node_tag, 2, :node => node)

     tags = Node.find(node.id).node_tags.order(:k)
     tags = Node.find(node.id).node_tags.order(:k)

-    assert_equal 2, tags.count
-    assert_equal "testing", tags[0].k
-    assert_equal "added in node version 3", tags[0].v
-    assert_equal "testing two", tags[1].k
-    assert_equal "modified in node version 4", tags[1].v
+    assert_equal taglist.count, tags.count
+    taglist.sort_by!(&:k).each_index do |i|
+      assert_equal taglist[i].k, tags[i].k
+      assert_equal taglist[i].v, tags[i].v
+    end

   end
 
   def test_tags
     node = current_nodes(:node_with_versions)
   end
 
   def test_tags
     node = current_nodes(:node_with_versions)

+    taglist = create_list(:node_tag, 2, :node => node)

     tags = Node.find(node.id).tags
     tags = Node.find(node.id).tags

-    assert_equal 2, tags.size
-    assert_equal "added in node version 3", tags["testing"]
-    assert_equal "modified in node version 4", tags["testing two"]
+    assert_equal taglist.count, tags.count
+    taglist.each do |tag|
+      assert_equal tag.v, tags[tag.k]
+    end

   end
 
   def test_containing_relation_members
   end
 
   def test_containing_relation_members