X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/137509534304be853ab01ca554111c524a9a1bca..33157534e1f2fc538a478c955fe1fd86dbbbec52:/test/unit/node_test.rb?ds=sidebyside

diff --git a/test/unit/node_test.rb b/test/unit/node_test.rb
index a2c8d7fb6..d1ec98e0d 100644
--- a/test/unit/node_test.rb
+++ b/test/unit/node_test.rb
@@ -1,12 +1,12 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
 class NodeTest < Test::Unit::TestCase
-  fixtures :changesets, :current_nodes, :users, :current_node_tags, :nodes, :node_tags
-  set_fixture_class :current_nodes => Node
-  set_fixture_class :nodes => OldNode
-  set_fixture_class :node_tags => OldNodeTag
-  set_fixture_class :current_node_tags => NodeTag
-    
+  api_fixtures
+  
+  def test_node_count
+    assert_equal 16, Node.count
+  end
+
   def test_node_too_far_north
 	  invalid_node_test(:node_too_far_north)
   end
@@ -82,7 +82,7 @@ class NodeTest < Test::Unit::TestCase
                              :changeset_id => changesets(:normal_user_first_change).id,
                              :visible => 1, 
                              :version => 1)
-    assert node_template.save_with_history!
+    assert node_template.create_with_history(users(:normal_user))
 
     node = Node.find(node_template.id)
     assert_not_nil node
@@ -114,7 +114,7 @@ class NodeTest < Test::Unit::TestCase
     node_template.latitude = 12.3456
     node_template.longitude = 65.4321
     #node_template.tags = "updated=yes"
-    assert node_template.save_with_history!
+    assert node_template.update_from(old_node_template, users(:normal_user))
 
     node = Node.find(node_template.id)
     assert_not_nil node
@@ -145,8 +145,7 @@ class NodeTest < Test::Unit::TestCase
     old_node_template = OldNode.find(:first, :conditions => [ "id = ?", node_template.id ])
     assert_not_nil old_node_template
 
-    node_template.visible = 0
-    assert node_template.save_with_history!
+    assert node_template.delete_with_history!(old_node_template, users(:normal_user))
 
     node = Node.find(node_template.id)
     assert_not_nil node