Update bundle

[rails.git] / test / test_helper.rb

diff --git a/test/test_helper.rb b/test/test_helper.rb
index c45331f2062ce3ea995f571c4fc380ce894cb720..e535d1645bb5f269231d076db3ede273b7ed6643 100644 (file)
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -15,51 +15,41 @@ module ActiveSupport
     def self.api_fixtures
       # print "setting up the api_fixtures"
       fixtures :users, :user_roles
     def self.api_fixtures
       # print "setting up the api_fixtures"
       fixtures :users, :user_roles

-      fixtures :changesets, :changeset_tags
+      fixtures :changesets

 
       fixtures :current_nodes, :nodes
       set_fixture_class :current_nodes => Node
       set_fixture_class :nodes => OldNode
 
 
       fixtures :current_nodes, :nodes
       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
-

       fixtures :current_ways
       set_fixture_class :current_ways => Way
 
       fixtures :current_ways
       set_fixture_class :current_ways => Way
 

-      fixtures :current_way_nodes, :current_way_tags
+      fixtures :current_way_nodes

       set_fixture_class :current_way_nodes => WayNode
       set_fixture_class :current_way_nodes => WayNode

-      set_fixture_class :current_way_tags => WayTag

 
       fixtures :ways
       set_fixture_class :ways => OldWay
 
 
       fixtures :ways
       set_fixture_class :ways => OldWay
 

-      fixtures :way_nodes, :way_tags
+      fixtures :way_nodes

       set_fixture_class :way_nodes => OldWayNode
       set_fixture_class :way_nodes => OldWayNode

-      set_fixture_class :way_tags => OldWayTag

 
       fixtures :current_relations
       set_fixture_class :current_relations => Relation
 
 
       fixtures :current_relations
       set_fixture_class :current_relations => Relation
 

-      fixtures :current_relation_members, :current_relation_tags
+      fixtures :current_relation_members

       set_fixture_class :current_relation_members => RelationMember
       set_fixture_class :current_relation_members => RelationMember

-      set_fixture_class :current_relation_tags => RelationTag

 
       fixtures :relations
       set_fixture_class :relations => OldRelation
 
 
       fixtures :relations
       set_fixture_class :relations => OldRelation
 

-      fixtures :relation_members, :relation_tags
+      fixtures :relation_members

       set_fixture_class :relation_members => OldRelationMember
       set_fixture_class :relation_members => OldRelationMember

-      set_fixture_class :relation_tags => OldRelationTag

 
       fixtures :gpx_files, :gps_points, :gpx_file_tags
       set_fixture_class :gpx_files => Trace
       set_fixture_class :gps_points => Tracepoint
       set_fixture_class :gpx_file_tags => Tracetag
 
 
       fixtures :gpx_files, :gps_points, :gpx_file_tags
       set_fixture_class :gpx_files => Trace
       set_fixture_class :gps_points => Tracepoint
       set_fixture_class :gpx_file_tags => Tracetag
 

-      fixtures :client_applications
-

       fixtures :redactions
     end
 
       fixtures :redactions
     end
 


@@ -77,6 +67,19 @@ module ActiveSupport
       end
     end
 
       end
     end
 

+    ##
+    # work round minitest insanity that causes it to tell you
+    # to use assert_nil to test for nil, which is fine if you're
+    # comparing to a nil constant but not if you're comparing
+    # an expression that might be nil sometimes
+    def assert_equal_allowing_nil(exp, act, msg = nil)
+      if exp.nil?
+        assert_nil act, msg
+      else
+        assert_equal exp, act, msg
+      end
+    end
+

     ##
     # for some reason assert_equal a, b fails when the relations are
     # actually equal, so this method manually checks the fields...
     ##
     # for some reason assert_equal a, b fails when the relations are
     # actually equal, so this method manually checks the fields...


@@ -174,5 +177,11 @@ module ActiveSupport
       url = "https://www.gravatar.com/avatar/#{hash}?d=404"
       stub_request(:get, url).and_return(:status => status, :body => body)
     end
       url = "https://www.gravatar.com/avatar/#{hash}?d=404"
       stub_request(:get, url).and_return(:status => status, :body => body)
     end

+
+    def stub_hostip_requests
+      # Controller tests and integration tests use different IPs
+      stub_request(:get, "http://api.hostip.info/country.php?ip=0.0.0.0")
+      stub_request(:get, "http://api.hostip.info/country.php?ip=127.0.0.1")
+    end

   end
 end
   end
 end