Set border=0 on that img

[rails.git] / test / integration / oauth_test.rb

diff --git a/test/integration/oauth_test.rb b/test/integration/oauth_test.rb
index 62eab0deed18d95b291a09b1d1148fa206f6d4a3..c10699f2aa1e422d9d37e0c9ec07848a0b08e712 100644 (file)
--- 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