Remove unnecessary token granting from the user_preferences tests

[rails.git] / test / test_helper.rb

diff --git a/test/test_helper.rb b/test/test_helper.rb
index f68c8e6661f90d440357eddce2a99417f23d1a58..83cf909dd94f208c5b89c20e024f8e6941e040f4 100644 (file)
--- 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"
 
 require "rails/test_help"
 require "webmock/minitest"
 

+WebMock.disable_net_connect!(:allow_localhost => true)
+

 module ActiveSupport
   class TestCase
     include FactoryBot::Syntax::Methods
 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
 
     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)
     end
 
     def email_text_parts(message)