cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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. :-)

Browse source
This commit is contained in:
Shaun McDonald 2008-10-27 18:45:28 +00:00
parent 8a57904398
commit e18c33f733
4 changed files with 27 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

33
test/test_helper.rb
View file

@ -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
##

4
test/unit/current_node_tag_test.rb
View file

@ -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

8
test/unit/node_test.rb
View file

@ -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)

8
test/unit/old_node_test.rb
View file

@ -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)