Stub out requests to hostip.info during tests

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

diff --git a/test/integration/oauth_test.rb b/test/integration/oauth_test.rb
index b52f55ea53124239908a93acdd376e8a728394c3..62eab0deed18d95b291a09b1d1148fa206f6d4a3 100644 (file)
--- a/test/integration/oauth_test.rb
+++ b/test/integration/oauth_test.rb
@@ -6,6 +6,10 @@ class OAuthTest < ActionDispatch::IntegrationTest
 
   include OAuth::Helper
 
+  setup do
+    stub_request(:get, "http://api.hostip.info/country.php?ip=127.0.0.1")
+  end
+
   def test_oauth10_web_app
     client = client_applications(:oauth_web_app)
 
@@ -53,6 +57,10 @@ class OAuthTest < ActionDispatch::IntegrationTest
   def oauth10_without_callback(client)
     token = get_request_token(client)
 
+    get "/oauth/authorize", :oauth_token => token.token
+    assert_response :success
+    assert_template :authorize
+
     post "/oauth/authorize",
          :oauth_token => token.token,
          :allow_read_prefs => true, :allow_write_prefs => true
@@ -90,7 +98,7 @@ class OAuthTest < ActionDispatch::IntegrationTest
 
     post "/oauth/revoke", :token => token.token
     assert_redirected_to oauth_clients_url(token.user.display_name)
-    token = OauthToken.find_by_token(token.token)
+    token = OauthToken.find_by(:token => token.token)
     assert_not_nil token.invalidated_at
 
     signed_get "/api/0.6/user/preferences", :consumer => client, :token => token
@@ -100,6 +108,10 @@ class OAuthTest < ActionDispatch::IntegrationTest
   def oauth10_refused(client)
     token = get_request_token(client)
 
+    get "/oauth/authorize", :oauth_token => token.token
+    assert_response :success
+    assert_template :authorize
+
     post "/oauth/authorize", :oauth_token => token.token
     assert_response :success
     assert_template :authorize_failure
@@ -108,6 +120,14 @@ class OAuthTest < ActionDispatch::IntegrationTest
     assert_nil token.authorized_at
     assert_not_nil token.invalidated_at
 
+    get "/oauth/authorize", :oauth_token => token.token
+    assert_response :success
+    assert_template :authorize_failure
+    assert_select "p", "The authorization token is not valid."
+    token.reload
+    assert_nil token.authorized_at
+    assert_not_nil token.invalidated_at
+
     post "/oauth/authorize", :oauth_token => token.token
     assert_response :success
     assert_template :authorize_failure
@@ -120,6 +140,10 @@ class OAuthTest < ActionDispatch::IntegrationTest
   def oauth10_with_callback(client, callback_url)
     token = get_request_token(client)
 
+    get "/oauth/authorize", :oauth_token => token.token
+    assert_response :success
+    assert_template :authorize
+
     post "/oauth/authorize",
          :oauth_token => token.token, :oauth_callback => callback_url,
          :allow_write_api => true, :allow_read_gpx => true
@@ -152,7 +176,7 @@ class OAuthTest < ActionDispatch::IntegrationTest
 
     post "/oauth/revoke", :token => token.token
     assert_redirected_to oauth_clients_url(token.user.display_name)
-    token = OauthToken.find_by_token(token.token)
+    token = OauthToken.find_by(:token => token.token)
     assert_not_nil token.invalidated_at
 
     signed_get "/api/0.6/gpx/2", :consumer => client, :token => token
@@ -162,6 +186,10 @@ class OAuthTest < ActionDispatch::IntegrationTest
   def oauth10a_without_callback(client)
     token = get_request_token(client, :oauth_callback => "oob")
 
+    get "/oauth/authorize", :oauth_token => token.token
+    assert_response :success
+    assert_template :authorize
+
     post "/oauth/authorize",
          :oauth_token => token.token,
          :allow_read_prefs => true, :allow_write_prefs => true
@@ -207,7 +235,7 @@ class OAuthTest < ActionDispatch::IntegrationTest
 
     post "/oauth/revoke", :token => token.token
     assert_redirected_to oauth_clients_url(token.user.display_name)
-    token = OauthToken.find_by_token(token.token)
+    token = OauthToken.find_by(:token => token.token)
     assert_not_nil token.invalidated_at
 
     signed_get "/api/0.6/user/preferences", :consumer => client, :token => token
@@ -217,6 +245,10 @@ class OAuthTest < ActionDispatch::IntegrationTest
   def oauth10a_with_callback(client, callback_url)
     token = get_request_token(client, :oauth_callback => callback_url)
 
+    get "/oauth/authorize", :oauth_token => token.token
+    assert_response :success
+    assert_template :authorize
+
     post "/oauth/authorize",
          :oauth_token => token.token,
          :allow_write_api => true, :allow_read_gpx => true
@@ -254,7 +286,7 @@ class OAuthTest < ActionDispatch::IntegrationTest
 
     post "/oauth/revoke", :token => token.token
     assert_redirected_to oauth_clients_url(token.user.display_name)
-    token = OauthToken.find_by_token(token.token)
+    token = OauthToken.find_by(:token => token.token)
     assert_not_nil token.invalidated_at
 
     signed_get "/api/0.6/gpx/2", :consumer => client, :token => token
@@ -264,6 +296,10 @@ class OAuthTest < ActionDispatch::IntegrationTest
   def oauth10a_refused(client)
     token = get_request_token(client, :oauth_callback => "oob")
 
+    get "/oauth/authorize", :oauth_token => token.token
+    assert_response :success
+    assert_template :authorize
+
     post "/oauth/authorize", :oauth_token => token.token
     assert_response :success
     assert_template :authorize_failure
@@ -272,6 +308,14 @@ class OAuthTest < ActionDispatch::IntegrationTest
     assert_nil token.authorized_at
     assert_not_nil token.invalidated_at
 
+    get "/oauth/authorize", :oauth_token => token.token
+    assert_response :success
+    assert_template :authorize_failure
+    assert_select "p", "The authorization token is not valid."
+    token.reload
+    assert_nil token.authorized_at
+    assert_not_nil token.invalidated_at
+
     post "/oauth/authorize", :oauth_token => token.token
     assert_response :success
     assert_template :authorize_failure
@@ -289,6 +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_allowed token, client.permissions
 
     token
@@ -315,7 +360,7 @@ class OAuthTest < ActionDispatch::IntegrationTest
   def parse_token(response)
     params = CGI.parse(response.body)
 
-    token = OauthToken.find_by_token(params["oauth_token"].first)
+    token = OauthToken.find_by(:token => params["oauth_token"].first)
     assert_equal token.secret, params["oauth_token_secret"].first
 
     token