Update bundle

[rails.git] / test / test_helper.rb

diff --git a/test/test_helper.rb b/test/test_helper.rb
index 11782e098f7e2f0054c176f1790e4e219cb2c1bc..88cfe4831150440f4b67c2af6c41a61965768521 100644 (file)
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -15,7 +15,7 @@ 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
 
       fixtures :current_nodes, :nodes
       set_fixture_class :current_nodes => Node


@@ -168,5 +168,17 @@ module ActiveSupport
 
       yield
     end
 
       yield
     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
+
+    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