Make sure we restore I18n.locale when tests complete

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

diff --git a/test/integration/oauth_test.rb b/test/integration/oauth_test.rb
index 9c37ff739c79bd6ebd30699e2eb4c9dd019905b1..dd03fde46ec899210d9ef2f07b025055a1d3d7c5 100644 (file)
--- a/test/integration/oauth_test.rb
+++ b/test/integration/oauth_test.rb
@@ -1,7 +1,7 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
-class OAuthTest < ActionController::IntegrationTest
-  fixtures :users, :client_applications
+class OAuthTest < ActionDispatch::IntegrationTest
+  fixtures :users, :client_applications, :gpx_files
 
   include OAuth::Helper
 
@@ -45,6 +45,17 @@ class OAuthTest < ActionController::IntegrationTest
     assert_nil token.invalidated_at
     assert_allowed token, [ :allow_read_prefs ]
 
+    signed_get "/api/0.6/user/preferences", :consumer => client, :token => token
+    assert_response :success
+
+    post "/oauth/revoke", :token => token.token
+    assert_redirected_to oauth_clients_url(token.user.display_name)
+    token = OauthToken.find_by_token(token.token)
+    assert_not_nil token.invalidated_at
+
+    signed_get "/api/0.6/user/preferences", :consumer => client, :token => token
+    assert_response :unauthorized
+
     signed_get "/oauth/request_token", :consumer => client
     assert_response :success
     token = parse_token(response)
@@ -78,6 +89,17 @@ class OAuthTest < ActionController::IntegrationTest
     assert_not_nil token.authorized_at
     assert_nil token.invalidated_at
     assert_allowed token, [ :allow_write_api, :allow_read_gpx ]
+
+    signed_get "/api/0.6/gpx/2", :consumer => client, :token => token
+    assert_response :success
+
+    post "/oauth/revoke", :token => token.token
+    assert_redirected_to oauth_clients_url(token.user.display_name)
+    token = OauthToken.find_by_token(token.token)
+    assert_not_nil token.invalidated_at
+
+    signed_get "/api/0.6/gpx/2", :consumer => client, :token => token
+    assert_response :unauthorized
   end
 
   def test_oauth10_desktop_app
@@ -119,6 +141,17 @@ class OAuthTest < ActionController::IntegrationTest
     assert_not_nil token.authorized_at
     assert_nil token.invalidated_at
     assert_allowed token, [ :allow_read_prefs ]
+
+    signed_get "/api/0.6/user/preferences", :consumer => client, :token => token
+    assert_response :success
+
+    post "/oauth/revoke", :token => token.token
+    assert_redirected_to oauth_clients_url(token.user.display_name)
+    token = OauthToken.find_by_token(token.token)
+    assert_not_nil token.invalidated_at
+
+    signed_get "/api/0.6/user/preferences", :consumer => client, :token => token
+    assert_response :unauthorized
   end
 
   def test_oauth10a_web_app
@@ -167,6 +200,17 @@ class OAuthTest < ActionController::IntegrationTest
     assert_nil token.invalidated_at
     assert_allowed token, [ :allow_read_prefs ]
 
+    signed_get "/api/0.6/user/preferences", :consumer => client, :token => token
+    assert_response :success
+
+    post "/oauth/revoke", :token => token.token
+    assert_redirected_to oauth_clients_url(token.user.display_name)
+    token = OauthToken.find_by_token(token.token)
+    assert_not_nil token.invalidated_at
+
+    signed_get "/api/0.6/user/preferences", :consumer => client, :token => token
+    assert_response :unauthorized
+
     signed_get "/oauth/request_token",
       :consumer => client,
       :oauth_callback => "http://another.web.app.org/callback"
@@ -206,6 +250,17 @@ class OAuthTest < ActionController::IntegrationTest
     assert_not_nil token.authorized_at
     assert_nil token.invalidated_at
     assert_allowed token, [ :allow_write_api, :allow_read_gpx ]
+
+    signed_get "/api/0.6/gpx/2", :consumer => client, :token => token
+    assert_response :success
+
+    post "/oauth/revoke", :token => token.token
+    assert_redirected_to oauth_clients_url(token.user.display_name)
+    token = OauthToken.find_by_token(token.token)
+    assert_not_nil token.invalidated_at
+
+    signed_get "/api/0.6/gpx/2", :consumer => client, :token => token
+    assert_response :unauthorized
   end
 
   def test_oauth10a_desktop_app
@@ -230,7 +285,7 @@ class OAuthTest < ActionController::IntegrationTest
       :allow_read_prefs => true, :allow_write_prefs => true
     assert_response :success
     assert_template "authorize_success"
-    m = response.body.match("<p>The verification code is ([A-Za-z0-9]+)</p>")
+    m = response.body.match("<p>The verification code is ([A-Za-z0-9]+).</p>")
     assert_not_nil m
     verifier = m[1]
     token.reload
@@ -255,6 +310,17 @@ class OAuthTest < ActionController::IntegrationTest
     assert_not_nil token.authorized_at
     assert_nil token.invalidated_at
     assert_allowed token, [ :allow_read_prefs ]
+
+    signed_get "/api/0.6/user/preferences", :consumer => client, :token => token
+    assert_response :success
+
+    post "/oauth/revoke", :token => token.token
+    assert_redirected_to oauth_clients_url(token.user.display_name)
+    token = OauthToken.find_by_token(token.token)
+    assert_not_nil token.invalidated_at
+
+    signed_get "/api/0.6/user/preferences", :consumer => client, :token => token
+    assert_response :unauthorized
   end
 
 private
@@ -262,7 +328,7 @@ private
   def signed_get(uri, options)
     uri = URI.parse(uri)
     uri.scheme ||= "http"
-    uri.host ||= host
+    uri.host ||= "www.example.com"
 
     helper = OAuth::Client::Helper.new(nil, options)
 
@@ -290,7 +356,7 @@ private
     params = CGI.parse(URI.parse(response.location).query)
 
     assert_not_nil params["oauth_verifier"]
-    assert_present params["oauth_verifier"].first
+    assert params["oauth_verifier"].first.present?
 
     params["oauth_verifier"].first
   end