Merge remote-tracking branch 'openstreetmap/pull/1350'

[rails.git] / test / test_helper.rb

diff --git a/test/test_helper.rb b/test/test_helper.rb
index 0cf7c4afba2037bff098d1613079b9c26a7a97ec..5f52bb135413deaa37bdd1b386e0e8227a3a5014 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


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


@@ -160,23 +161,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_signup_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