Merge 14394:14533 from trunk.

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

diff --git a/test/unit/node_test.rb b/test/unit/node_test.rb
index 2c6515cb7db019344d8d0a525e22f1b11f30f689..51cf82d123d1670cb0ef7f1704ec325d4831166d 100644 (file)
--- a/test/unit/node_test.rb
+++ b/test/unit/node_test.rb
@@ -1,12 +1,8 @@
 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_too_far_north
          invalid_node_test(:node_too_far_north)
   end
@@ -79,10 +75,10 @@ class NodeTest < Test::Unit::TestCase
   def test_create
     node_template = Node.new(:latitude => 12.3456,
                              :longitude => 65.4321,
-                             :changeset_id => changesets(:normal_user_first_change),
+                             :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 +110,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 +141,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