Update bundle

[rails.git] / test / test_helper.rb

diff --git a/test/test_helper.rb b/test/test_helper.rb
index 42b7cc498bb1b085e842f7fd2e368f651b5ac7e7..e535d1645bb5f269231d076db3ede273b7ed6643 100644 (file)
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -4,6 +4,7 @@ Coveralls.wear!("rails")
 ENV["RAILS_ENV"] = "test"
 require File.expand_path("../../config/environment", __FILE__)
 require "rails/test_help"
 ENV["RAILS_ENV"] = "test"
 require File.expand_path("../../config/environment", __FILE__)
 require "rails/test_help"

+require "webmock/minitest"

 load "composite_primary_keys/fixtures.rb"
 
 module ActiveSupport
 load "composite_primary_keys/fixtures.rb"
 
 module ActiveSupport


@@ -13,52 +14,42 @@ module ActiveSupport
     # Load standard fixtures needed to test API methods
     def self.api_fixtures
       # print "setting up the api_fixtures"
     # Load standard fixtures needed to test API methods
     def self.api_fixtures
       # print "setting up the api_fixtures"

-      fixtures :users, :user_roles, :user_blocks
-      fixtures :changesets, :changeset_tags, :changeset_comments
+      fixtures :users, :user_roles
+      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
 


@@ -76,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...


@@ -160,23 +164,24 @@ module ActiveSupport
     ##
     # execute a block with a given set of HTTP responses stubbed
     def with_http_stubs(stubs_file)
     ##
     # execute a block with a given set of HTTP responses stubbed
     def with_http_stubs(stubs_file)

-      http_client_save = OSM.http_client
+      stubs = YAML.load_file(File.expand_path("../http/#{stubs_file}.yml", __FILE__))
+      stubs.each do |url, response|
+        stub_request(:get, Regexp.new(Regexp.quote(url))).to_return(:status => response["code"], :body => response["body"])
+      end

 
 

-      begin
-        stubs = YAML.load_file(File.expand_path("../http/#{stubs_file}.yml", __FILE__))
+      yield
+    end

 
 

-        OSM.http_client = Faraday.new do |builder|
-          builder.adapter :test do |stub|
-            stubs.each do |url, response|
-              stub.get(url) { |_env| [response["code"], {}, response["body"]] }
-            end
-          end
-        end
+    def stub_gravatar_request(email, status = 200, body = nil)
+      hash = Digest::MD5.hexdigest(email.downcase)
+      url = "https://www.gravatar.com/avatar/#{hash}?d=404"
+      stub_request(:get, url).and_return(:status => status, :body => body)
+    end

 
 

-        yield
-      ensure
-        OSM.http_client = http_client_save
-      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
 end