Update banner FAQ.

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

diff --git a/test/integration/oauth_test.rb b/test/integration/oauth_test.rb
index 618ced0e6304625f4a22d16e6dc24693facab5b9..579941774567b621b156cccf1ff197da99b2f3e9 100644 (file)
--- a/test/integration/oauth_test.rb
+++ b/test/integration/oauth_test.rb
@@ -6,8 +6,9 @@ class OAuthTest < ActionDispatch::IntegrationTest
   def test_oauth10_web_app
     client = create(:client_application, :callback_url => "http://some.web.app.example.org/callback", :allow_read_prefs => true, :allow_write_api => true, :allow_read_gpx => true)
 
-    post "/login", :params => { :username => client.user.email, :password => "test" }
+    get "/login"
     follow_redirect!
+    post "/login", :params => { :username => client.user.email, :password => "test" }
     follow_redirect!
     assert_response :success
 
@@ -19,8 +20,9 @@ class OAuthTest < ActionDispatch::IntegrationTest
   def test_oauth10_desktop_app
     client = create(:client_application, :allow_read_prefs => true, :allow_write_api => true, :allow_read_gpx => true)
 
-    post "/login", :params => { :username => client.user.email, :password => "test" }
+    get "/login"
     follow_redirect!
+    post "/login", :params => { :username => client.user.email, :password => "test" }
     follow_redirect!
     assert_response :success
 
@@ -31,8 +33,9 @@ class OAuthTest < ActionDispatch::IntegrationTest
   def test_oauth10a_web_app
     client = create(:client_application, :callback_url => "http://some.web.app.example.org/callback", :allow_read_prefs => true, :allow_write_api => true, :allow_read_gpx => true)
 
-    post "/login", :params => { :username => client.user.email, :password => "test" }
+    get "/login"
     follow_redirect!
+    post "/login", :params => { :username => client.user.email, :password => "test" }
     follow_redirect!
     assert_response :success
 
@@ -44,8 +47,9 @@ class OAuthTest < ActionDispatch::IntegrationTest
   def test_oauth10a_desktop_app
     client = create(:client_application, :allow_read_prefs => true, :allow_write_api => true, :allow_read_gpx => true)
 
-    post "/login", :params => { :username => client.user.email, :password => "test" }
+    get "/login"
     follow_redirect!
+    post "/login", :params => { :username => client.user.email, :password => "test" }
     follow_redirect!
     assert_response :success
 
@@ -64,7 +68,7 @@ class OAuthTest < ActionDispatch::IntegrationTest
 
     post "/oauth/authorize",
          :params => { :oauth_token => token.token,
-                      :allow_read_prefs => true, :allow_write_prefs => true }
+                      :allow_read_prefs => "1", :allow_write_prefs => "1" }
     if client.callback_url
       assert_response :redirect
       assert_redirected_to "#{client.callback_url}?oauth_token=#{token.token}"
@@ -78,7 +82,7 @@ class OAuthTest < ActionDispatch::IntegrationTest
     assert_nil token.invalidated_at
     assert_allowed token, [:allow_read_prefs]
 
-    signed_get "/oauth/access_token", :consumer => client, :token => token
+    signed_get "/oauth/access_token", :oauth => { :token => token }
     assert_response :success
     token.reload
     assert_not_nil token.created_at
@@ -91,10 +95,10 @@ class OAuthTest < ActionDispatch::IntegrationTest
     assert_nil token.invalidated_at
     assert_allowed token, [:allow_read_prefs]
 
-    signed_get "/api/0.6/user/preferences", :consumer => client, :token => token
+    signed_get "/api/0.6/user/preferences", :oauth => { :token => token }
     assert_response :success
 
-    signed_get "/api/0.6/gpx/2", :consumer => client, :token => token
+    signed_get "/api/0.6/gpx/2", :oauth => { :token => token }
     assert_response :forbidden
 
     post "/oauth/revoke", :params => { :token => token.token }
@@ -102,7 +106,7 @@ class OAuthTest < ActionDispatch::IntegrationTest
     token = OauthToken.find_by(:token => token.token)
     assert_not_nil token.invalidated_at
 
-    signed_get "/api/0.6/user/preferences", :consumer => client, :token => token
+    signed_get "/api/0.6/user/preferences", :oauth => { :token => token }
     assert_response :unauthorized
   end
 
@@ -147,7 +151,7 @@ class OAuthTest < ActionDispatch::IntegrationTest
 
     post "/oauth/authorize",
          :params => { :oauth_token => token.token, :oauth_callback => callback_url,
-                      :allow_write_api => true, :allow_read_gpx => true }
+                      :allow_write_api => "1", :allow_read_gpx => "1" }
     assert_response :redirect
     assert_redirected_to "#{callback_url}?oauth_token=#{token.token}"
     token.reload
@@ -156,7 +160,7 @@ class OAuthTest < ActionDispatch::IntegrationTest
     assert_nil token.invalidated_at
     assert_allowed token, [:allow_write_api, :allow_read_gpx]
 
-    signed_get "/oauth/access_token", :consumer => client, :token => token
+    signed_get "/oauth/access_token", :oauth => { :token => token }
     assert_response :success
     token.reload
     assert_not_nil token.created_at
@@ -170,10 +174,10 @@ class OAuthTest < ActionDispatch::IntegrationTest
     assert_allowed token, [:allow_write_api, :allow_read_gpx]
 
     trace = create(:trace, :user => client.user)
-    signed_get "/api/0.6/gpx/#{trace.id}", :consumer => client, :token => token
+    signed_get "/api/0.6/gpx/#{trace.id}", :oauth => { :token => token }
     assert_response :success
 
-    signed_get "/api/0.6/user/details", :consumer => client, :token => token
+    signed_get "/api/0.6/user/details", :oauth => { :token => token }
     assert_response :forbidden
 
     post "/oauth/revoke", :params => { :token => token.token }
@@ -181,7 +185,7 @@ class OAuthTest < ActionDispatch::IntegrationTest
     token = OauthToken.find_by(:token => token.token)
     assert_not_nil token.invalidated_at
 
-    signed_get "/api/0.6/gpx/2", :consumer => client, :token => token
+    signed_get "/api/0.6/gpx/2", :oauth => { :token => token }
     assert_response :unauthorized
   end
 
@@ -194,7 +198,7 @@ class OAuthTest < ActionDispatch::IntegrationTest
 
     post "/oauth/authorize",
          :params => { :oauth_token => token.token,
-                      :allow_read_prefs => true, :allow_write_prefs => true }
+                      :allow_read_prefs => "1", :allow_write_prefs => "1" }
     if client.callback_url
       assert_response :redirect
       verifier = parse_verifier(response)
@@ -212,11 +216,10 @@ class OAuthTest < ActionDispatch::IntegrationTest
     assert_nil token.invalidated_at
     assert_allowed token, [:allow_read_prefs]
 
-    signed_get "/oauth/access_token", :consumer => client, :token => token
+    signed_get "/oauth/access_token", :oauth => { :token => token }
     assert_response :unauthorized
 
-    signed_get "/oauth/access_token",
-               :consumer => client, :token => token, :oauth_verifier => verifier
+    signed_get "/oauth/access_token", :oauth => { :token => token, :oauth_verifier => verifier }
     assert_response :success
     token.reload
     assert_not_nil token.created_at
@@ -229,11 +232,11 @@ class OAuthTest < ActionDispatch::IntegrationTest
     assert_nil token.invalidated_at
     assert_allowed token, [:allow_read_prefs]
 
-    signed_get "/api/0.6/user/preferences", :consumer => client, :token => token
+    signed_get "/api/0.6/user/preferences", :oauth => { :token => token }
     assert_response :success
 
     trace = create(:trace, :user => client.user)
-    signed_get "/api/0.6/gpx/#{trace.id}", :consumer => client, :token => token
+    signed_get "/api/0.6/gpx/#{trace.id}", :oauth => { :token => token }
     assert_response :forbidden
 
     post "/oauth/revoke", :params => { :token => token.token }
@@ -241,7 +244,7 @@ class OAuthTest < ActionDispatch::IntegrationTest
     token = OauthToken.find_by(:token => token.token)
     assert_not_nil token.invalidated_at
 
-    signed_get "/api/0.6/user/preferences", :consumer => client, :token => token
+    signed_get "/api/0.6/user/preferences", :oauth => { :token => token }
     assert_response :unauthorized
   end
 
@@ -254,7 +257,7 @@ class OAuthTest < ActionDispatch::IntegrationTest
 
     post "/oauth/authorize",
          :params => { :oauth_token => token.token,
-                      :allow_write_api => true, :allow_read_gpx => true }
+                      :allow_write_api => "1", :allow_read_gpx => "1" }
     assert_response :redirect
     verifier = parse_verifier(response)
     assert_redirected_to "#{callback_url}?oauth_token=#{token.token}&oauth_verifier=#{verifier}"
@@ -264,11 +267,10 @@ class OAuthTest < ActionDispatch::IntegrationTest
     assert_nil token.invalidated_at
     assert_allowed token, [:allow_write_api, :allow_read_gpx]
 
-    signed_get "/oauth/access_token", :consumer => client, :token => token
+    signed_get "/oauth/access_token", :oauth => { :token => token }
     assert_response :unauthorized
 
-    signed_get "/oauth/access_token",
-               :consumer => client, :token => token, :oauth_verifier => verifier
+    signed_get "/oauth/access_token", :oauth => { :token => token, :oauth_verifier => verifier }
     assert_response :success
     token.reload
     assert_not_nil token.created_at
@@ -282,10 +284,10 @@ class OAuthTest < ActionDispatch::IntegrationTest
     assert_allowed token, [:allow_write_api, :allow_read_gpx]
 
     trace = create(:trace, :user => client.user)
-    signed_get "/api/0.6/gpx/#{trace.id}", :consumer => client, :token => token
+    signed_get "/api/0.6/gpx/#{trace.id}", :oauth => { :token => token }
     assert_response :success
 
-    signed_get "/api/0.6/user/details", :consumer => client, :token => token
+    signed_get "/api/0.6/user/details", :oauth => { :token => token }
     assert_response :forbidden
 
     post "/oauth/revoke", :params => { :token => token.token }
@@ -293,7 +295,7 @@ class OAuthTest < ActionDispatch::IntegrationTest
     token = OauthToken.find_by(:token => token.token)
     assert_not_nil token.invalidated_at
 
-    signed_get "/api/0.6/gpx/2", :consumer => client, :token => token
+    signed_get "/api/0.6/gpx/2", :oauth => { :token => token }
     assert_response :unauthorized
   end
 
@@ -330,7 +332,7 @@ class OAuthTest < ActionDispatch::IntegrationTest
   end
 
   def get_request_token(client, options = {})
-    signed_get "/oauth/request_token", options.merge(:consumer => client)
+    signed_get "/oauth/request_token", :oauth => options.merge(:consumer => client)
     assert_response :success
     token = parse_token(response)
     assert_instance_of RequestToken, token
@@ -343,24 +345,6 @@ class OAuthTest < ActionDispatch::IntegrationTest
     token
   end
 
-  def signed_get(uri, options)
-    uri = URI.parse(uri)
-    uri.scheme ||= "http"
-    uri.host ||= "www.example.com"
-
-    helper = OAuth::Client::Helper.new(nil, options)
-
-    request = OAuth::RequestProxy.proxy(
-      "method" => "GET",
-      "uri" => uri,
-      "parameters" => helper.oauth_parameters
-    )
-
-    request.sign!(options)
-
-    get request.signed_uri
-  end
-
   def parse_token(response)
     params = CGI.parse(response.body)