X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/98de681e4711ad3bf5526e511002c8f0e91860a8..44217775f0f8556c662aa9b39aeed80c97c7f8ed:/test/test_helper.rb diff --git a/test/test_helper.rb b/test/test_helper.rb index f68c8e666..83cf909dd 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -6,6 +6,8 @@ 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 @@ -137,8 +139,8 @@ module ActiveSupport 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)