X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/f02729fa9a29089224502fecc7bf347fa73db0dd..4d73706ff349e043ca62612e977ae600e8cae4ad:/test/test_helper.rb

diff --git a/test/test_helper.rb b/test/test_helper.rb
index 419ea1806..c45331f20 100644
--- 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"
+require "webmock/minitest"
 load "composite_primary_keys/fixtures.rb"
 
 module ActiveSupport
@@ -13,8 +14,8 @@ module ActiveSupport
     # 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, :changeset_tags
 
       fixtures :current_nodes, :nodes
       set_fixture_class :current_nodes => Node
@@ -60,8 +61,6 @@ module ActiveSupport
       fixtures :client_applications
 
       fixtures :redactions
-
-      fixtures :notes, :note_comments
     end
 
     ##
@@ -162,23 +161,18 @@ module ActiveSupport
     ##
     # execute a block with a given set of HTTP responses stubbed
     def with_http_stubs(stubs_file)
-      http_client_save = OSM.http_client
-
-      begin
-        stubs = YAML.load_file(File.expand_path("../http/#{stubs_file}.yml", __FILE__))
+      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
 
-        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
+      yield
+    end
 
-        yield
-      ensure
-        OSM.http_client = http_client_save
-      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
   end
 end