X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/d3d6e9902c8b03fcd31df253cf395f06f757880a..b9b255fa65813af95702b848cb084e2286345de9:/test/integration/oauth_test.rb

diff --git a/test/integration/oauth_test.rb b/test/integration/oauth_test.rb
index 62eab0dee..c10699f2a 100644
--- a/test/integration/oauth_test.rb
+++ b/test/integration/oauth_test.rb
@@ -6,8 +6,8 @@ class OAuthTest < ActionDispatch::IntegrationTest
 
   include OAuth::Helper
 
-  setup do
-    stub_request(:get, "http://api.hostip.info/country.php?ip=127.0.0.1")
+  def setup
+    stub_hostip_requests
   end
 
   def test_oauth10_web_app
@@ -333,7 +333,7 @@ class OAuthTest < ActionDispatch::IntegrationTest
     assert_not_nil token.created_at
     assert_nil token.authorized_at
     assert_nil token.invalidated_at
-    assert_equal options[:oauth_callback], token.callback_url
+    assert_equal_allowing_nil options[:oauth_callback], token.callback_url
     assert_allowed token, client.permissions
 
     token