From: Shaun McDonald <shaun@shaunmcdonald.me.uk>
Date: Mon, 27 Oct 2008 18:45:28 +0000 (+0000)
Subject: Prepare for Rails 2.1+, as we will no longer be able to use a symbol in the set_fixtu... 
X-Git-Tag: live~7573^2~240
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/e18c33f733007e898786ee63c7f40a854b4772c6

Prepare for Rails 2.1+, as we will no longer be able to use a symbol in the set_fixture_class method, instead we must use a Class. This change doesn't affect Rails 2.0.2, as currently used. All tests still work. :-)
---

diff --git a/test/test_helper.rb b/test/test_helper.rb
index 713bbf648..a170aed4f 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -27,35 +27,36 @@ class Test::Unit::TestCase
 
   # Load standard fixtures needed to test API methods
   def self.api_fixtures
+    print "setting up the api_fixtures"
     fixtures :users, :changesets
 
     fixtures :current_nodes, :nodes
-    set_fixture_class :current_nodes => :Node
-    set_fixture_class :nodes => :OldNode
+    set_fixture_class :current_nodes => Node
+    set_fixture_class :nodes => OldNode
 
     fixtures  :current_node_tags,:node_tags
-    set_fixture_class :current_node_tags => :NodeTag
-    set_fixture_class :node_tags => :OldNodeTag
+    set_fixture_class :current_node_tags => NodeTag
+    set_fixture_class :node_tags => OldNodeTag
 
     fixtures :current_ways, :current_way_nodes, :current_way_tags
-    set_fixture_class :current_ways => :Way
-    set_fixture_class :current_way_nodes => :WayNode
-    set_fixture_class :current_way_tags => :WayTag
+    set_fixture_class :current_ways => Way
+    set_fixture_class :current_way_nodes => WayNode
+    set_fixture_class :current_way_tags => WayTag
 
     fixtures :ways, :way_nodes, :way_tags
-    set_fixture_class :ways => :OldWay
-    set_fixture_class :way_nodes => :OldWayNode
-    set_fixture_class :way_tags => :OldWayTag
+    set_fixture_class :ways => OldWay
+    set_fixture_class :way_nodes => OldWayNode
+    set_fixture_class :way_tags => OldWayTag
 
     fixtures :current_relations, :current_relation_members, :current_relation_tags
-    set_fixture_class :current_relations => :Relation
-    set_fixture_class :current_relation_members => :RelationMember
-    set_fixture_class :current_relation_tags => :RelationTag
+    set_fixture_class :current_relations => Relation
+    set_fixture_class :current_relation_members => RelationMember
+    set_fixture_class :current_relation_tags => RelationTag
 
     fixtures :relations, :relation_members, :relation_tags
-    set_fixture_class :relations => :OldRelation
-    set_fixture_class :relation_members => :OldRelationMember
-    set_fixture_class :relation_tags => :OldRelationTag
+    set_fixture_class :relations => OldRelation
+    set_fixture_class :relation_members => OldRelationMember
+    set_fixture_class :relation_tags => OldRelationTag
   end
 
   ##
diff --git a/test/unit/current_node_tag_test.rb b/test/unit/current_node_tag_test.rb
index 98bceb4e5..143fa2442 100644
--- a/test/unit/current_node_tag_test.rb
+++ b/test/unit/current_node_tag_test.rb
@@ -2,8 +2,8 @@ require File.dirname(__FILE__) + '/../test_helper'
 
 class CurrentNodeTagTest < Test::Unit::TestCase
   fixtures :current_node_tags, :current_nodes
-  set_fixture_class :current_nodes => :Node
-  set_fixture_class :current_node_tags => :NodeTag
+  set_fixture_class :current_nodes => Node
+  set_fixture_class :current_node_tags => NodeTag
   
   def test_tag_count
     assert_equal 6, NodeTag.count
diff --git a/test/unit/node_test.rb b/test/unit/node_test.rb
index 7efbf9c06..2c6515cb7 100644
--- a/test/unit/node_test.rb
+++ b/test/unit/node_test.rb
@@ -2,10 +2,10 @@ 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
+  set_fixture_class :current_nodes => Node
+  set_fixture_class :nodes => OldNode
+  set_fixture_class :node_tags => OldNodeTag
+  set_fixture_class :current_node_tags => NodeTag
     
   def test_node_too_far_north
 	  invalid_node_test(:node_too_far_north)
diff --git a/test/unit/old_node_test.rb b/test/unit/old_node_test.rb
index 5623e9657..bdd685388 100644
--- a/test/unit/old_node_test.rb
+++ b/test/unit/old_node_test.rb
@@ -1,11 +1,11 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
 class OldNodeTest < Test::Unit::TestCase
+  set_fixture_class :current_nodes => Node
+  set_fixture_class :nodes => OldNode
+  set_fixture_class :node_tags => OldNodeTag
+  set_fixture_class :current_node_tags => NodeTag
   fixtures :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
     
   def test_node_too_far_north
 	  invalid_node_test(:node_too_far_north)