Merge rails_port as of r4613 & fix tests.

test/fixtures/current_relation_members.yml

@@ -1,5 +1,23 @@
 t1:
   id: 1
   member_role: "some"
-  member_type: "node"
+  member_type: "way"
   member_id: 3
+
+t2:
+  id: 1
+  member_role: "some"
+  member_type: "node"
+  member_id: 5
+
+t3:
+  id: 1
+  member_role: "some"
+  member_type: "relation"
+  member_id: 3
+
+t4:
+  id: 3
+  member_role: "some"
+  member_type: "node"
+  member_id: 5

test/fixtures/current_relation_tags.yml

@@ -7,3 +7,8 @@ t2:
   id: 2
   k: test
   v: yes
+
+t2:
+  id: 3
+  k: test
+  v: yes

test/fixtures/current_relations.yml

@@ -9,3 +9,9 @@ invisible_relation:
   user_id: 1
   timestamp: 2007-01-01 00:00:00
   visible: 0
+
+used_relation:
+  id: 3
+  user_id: 1
+  timestamp: 2007-01-01 00:00:00
+  visible: 1

test/fixtures/relation_members.yml

@@ -1,6 +1,24 @@
 t1:
   id: 1
   member_role: "some"
-  member_type: "node"
+  member_type: "way"
   member_id: 3
   version: 1
+t2:
+  id: 1
+  member_role: "some"
+  member_type: "node"
+  member_id: 5
+  version: 1
+t3:
+  id: 1
+  member_role: "some"
+  member_type: "relation"
+  member_id: 3
+  version: 1
+t4:
+  id: 3
+  member_role: "some"
+  member_type: "node"
+  member_id: 5
+  version: 1

test/fixtures/relation_tags.yml

@@ -9,3 +9,9 @@ t2:
   k: test
   v: yes
   version: 1
+
+t3:
+  id: 3
+  k: test
+  v: yes
+  version: 1

test/fixtures/relations.yml

@@ -11,3 +11,10 @@ invisible_relation:
   timestamp: 2007-01-01 00:00:00
   visible: 0
   version: 1
+
+used_relation:
+  id: 3
+  user_id: 1
+  timestamp: 2007-01-01 00:00:00
+  visible: 1
+  version: 1

test/functional/relation_controller_test.rb

@@ -42,7 +42,7 @@ class RelationControllerTest < Test::Unit::TestCase
     assert_response :not_found
 
     # check the "relations for node" mode
-    get :relations_for_node, :id => current_nodes(:used_node_1).id
+    get :relations_for_node, :id => current_nodes(:node_used_by_relationship).id
     assert_response :success
     # FIXME check whether this contains the stuff we want!
     if $VERBOSE
@@ -59,7 +59,7 @@ class RelationControllerTest < Test::Unit::TestCase
 
 
     # check the "relations for relation" mode
-    get :relations_for_node, :id => current_relations(:used_relation).id
+    get :relations_for_relation, :id => current_relations(:used_relation).id
     assert_response :success
     # FIXME check whether this contains the stuff we want!
     if $VERBOSE
@@ -67,7 +67,7 @@ class RelationControllerTest < Test::Unit::TestCase
     end
 
     # check the "full" mode
-    get :full, :id => current_relations(:relation_using_all).id
+    get :full, :id => current_relations(:visible_relation).id
     assert_response :success
     # FIXME check whether this contains the stuff we want!
     if $VERBOSE

test/unit/node_test.rb

@@ -11,7 +11,7 @@ class NodeTest < Test::Unit::TestCase
                              :user_id => users(:normal_user).id,
                              :visible => 1,
                              :tags => "")
-    assert node_template.save_with_history
+    assert node_template.save_with_history!
 
     node = Node.find(node_template.id)
     assert_not_nil node
@@ -44,7 +44,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.save_with_history!
 
     node = Node.find(node_template.id)
     assert_not_nil node
@@ -76,7 +76,7 @@ class NodeTest < Test::Unit::TestCase
     assert_not_nil old_node_template
 
     node_template.visible = 0
-    assert node_template.save_with_history
+    assert node_template.save_with_history!
 
     node = Node.find(node_template.id)
     assert_not_nil node