X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/8bd001f1282b7a33a71c0565504e160dbe567d5d..aaf56003427cfcbd89fda0847726fd0baa34050c:/test/test_helper.rb?ds=sidebyside diff --git a/test/test_helper.rb b/test/test_helper.rb index 7198519a7..747edf016 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -2,13 +2,16 @@ require "coveralls" Coveralls.wear!("rails") ENV["RAILS_ENV"] = "test" -require File.expand_path("../config/environment", __dir__) +require_relative "../config/environment" require "rails/test_help" require "webmock/minitest" +WebMock.disable_net_connect!(:allow_localhost => true) + module ActiveSupport class TestCase include FactoryBot::Syntax::Methods + include ActiveJob::TestHelper ## # takes a block which is executed in the context of a different @@ -91,12 +94,6 @@ module ActiveSupport @request.env["HTTP_X_ERROR_FORMAT"] = format end - ## - # set the raw body to be sent with a POST request - def content(c) - @request.env["RAW_POST_DATA"] = c.to_s - end - ## # Used to check that the error header and the forbidden responses are given # when the owner of the changset has their data not marked as public @@ -130,15 +127,15 @@ module ActiveSupport end def stub_gravatar_request(email, status = 200, body = nil) - hash = Digest::MD5.hexdigest(email.downcase) + 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") + stub_request(:get, "https://api.hostip.info/country.php?ip=0.0.0.0") + stub_request(:get, "https://api.hostip.info/country.php?ip=127.0.0.1") end def email_text_parts(message)