Remove travis-ci support

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

diff --git a/test/integration/oauth_test.rb b/test/integration/oauth_test.rb
index 8971b7a2b3b12984aa0ee980c73a91c9f5e42768..3242df9e2619d96878c13cc96fd4ca561724073a 100644 (file)
--- a/test/integration/oauth_test.rb
+++ b/test/integration/oauth_test.rb
@@ -1,18 +1,14 @@
 require "test_helper"
 
 class OAuthTest < ActionDispatch::IntegrationTest
 require "test_helper"
 
 class OAuthTest < ActionDispatch::IntegrationTest

-  fixtures :users
-

   include OAuth::Helper
 
   include OAuth::Helper
 

-  def setup
-    stub_hostip_requests
-  end
-

   def test_oauth10_web_app
   def test_oauth10_web_app

-    client = create(:client_application, :callback_url => "http://some.web.app.example.org/callback", :user => users(:public_user), :allow_read_prefs => true, :allow_write_api => true, :allow_read_gpx => true)
+    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_via_redirect "/login", :username => client.user.email, :password => "test"
+    post "/login", :params => { :username => client.user.email, :password => "test" }
+    follow_redirect!
+    follow_redirect!

     assert_response :success
 
     oauth10_without_callback(client)
     assert_response :success
 
     oauth10_without_callback(client)


@@ -21,9 +17,11 @@ class OAuthTest < ActionDispatch::IntegrationTest
   end
 
   def test_oauth10_desktop_app
   end
 
   def test_oauth10_desktop_app

-    client = create(:client_application, :user => users(:public_user), :allow_read_prefs => true, :allow_write_api => true, :allow_read_gpx => true)
+    client = create(:client_application, :allow_read_prefs => true, :allow_write_api => true, :allow_read_gpx => true)

 
 

-    post_via_redirect "/login", :username => client.user.email, :password => "test"
+    post "/login", :params => { :username => client.user.email, :password => "test" }
+    follow_redirect!
+    follow_redirect!

     assert_response :success
 
     oauth10_without_callback(client)
     assert_response :success
 
     oauth10_without_callback(client)


@@ -31,9 +29,11 @@ class OAuthTest < ActionDispatch::IntegrationTest
   end
 
   def test_oauth10a_web_app
   end
 
   def test_oauth10a_web_app

-    client = create(:client_application, :callback_url => "http://some.web.app.example.org/callback", :user => users(:public_user), :allow_read_prefs => true, :allow_write_api => true, :allow_read_gpx => true)
+    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_via_redirect "/login", :username => client.user.email, :password => "test"
+    post "/login", :params => { :username => client.user.email, :password => "test" }
+    follow_redirect!
+    follow_redirect!

     assert_response :success
 
     oauth10a_without_callback(client)
     assert_response :success
 
     oauth10a_without_callback(client)


@@ -42,9 +42,11 @@ class OAuthTest < ActionDispatch::IntegrationTest
   end
 
   def test_oauth10a_desktop_app
   end
 
   def test_oauth10a_desktop_app

-    client = create(:client_application, :user => users(:public_user), :allow_read_prefs => true, :allow_write_api => true, :allow_read_gpx => true)
+    client = create(:client_application, :allow_read_prefs => true, :allow_write_api => true, :allow_read_gpx => true)

 
 

-    post_via_redirect "/login", :username => client.user.email, :password => "test"
+    post "/login", :params => { :username => client.user.email, :password => "test" }
+    follow_redirect!
+    follow_redirect!

     assert_response :success
 
     oauth10a_without_callback(client)
     assert_response :success
 
     oauth10a_without_callback(client)


@@ -56,13 +58,13 @@ class OAuthTest < ActionDispatch::IntegrationTest
   def oauth10_without_callback(client)
     token = get_request_token(client)
 
   def oauth10_without_callback(client)
     token = get_request_token(client)
 

-    get "/oauth/authorize", :oauth_token => token.token
+    get "/oauth/authorize", :params => { :oauth_token => token.token }

     assert_response :success
     assert_template :authorize
 
     post "/oauth/authorize",
     assert_response :success
     assert_template :authorize
 
     post "/oauth/authorize",

-         :oauth_token => token.token,
-         :allow_read_prefs => true, :allow_write_prefs => true
+         :params => { :oauth_token => token.token,
+                      :allow_read_prefs => true, :allow_write_prefs => true }

     if client.callback_url
       assert_response :redirect
       assert_redirected_to "#{client.callback_url}?oauth_token=#{token.token}"
     if client.callback_url
       assert_response :redirect
       assert_redirected_to "#{client.callback_url}?oauth_token=#{token.token}"


@@ -76,7 +78,7 @@ class OAuthTest < ActionDispatch::IntegrationTest
     assert_nil token.invalidated_at
     assert_allowed token, [:allow_read_prefs]
 
     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
     assert_response :success
     token.reload
     assert_not_nil token.created_at


@@ -89,29 +91,29 @@ class OAuthTest < ActionDispatch::IntegrationTest
     assert_nil token.invalidated_at
     assert_allowed token, [:allow_read_prefs]
 
     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
 
     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
 
     assert_response :forbidden
 

-    post "/oauth/revoke", :token => token.token
+    post "/oauth/revoke", :params => { :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
 
     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
+    signed_get "/api/0.6/user/preferences", :oauth => { :token => token }

     assert_response :unauthorized
   end
 
   def oauth10_refused(client)
     token = get_request_token(client)
 
     assert_response :unauthorized
   end
 
   def oauth10_refused(client)
     token = get_request_token(client)
 

-    get "/oauth/authorize", :oauth_token => token.token
+    get "/oauth/authorize", :params => { :oauth_token => token.token }

     assert_response :success
     assert_template :authorize
 
     assert_response :success
     assert_template :authorize
 

-    post "/oauth/authorize", :oauth_token => token.token
+    post "/oauth/authorize", :params => { :oauth_token => token.token }

     assert_response :success
     assert_template :authorize_failure
     assert_select "p", "You have denied application #{client.name} access to your account."
     assert_response :success
     assert_template :authorize_failure
     assert_select "p", "You have denied application #{client.name} access to your account."


@@ -119,7 +121,7 @@ class OAuthTest < ActionDispatch::IntegrationTest
     assert_nil token.authorized_at
     assert_not_nil token.invalidated_at
 
     assert_nil token.authorized_at
     assert_not_nil token.invalidated_at
 

-    get "/oauth/authorize", :oauth_token => token.token
+    get "/oauth/authorize", :params => { :oauth_token => token.token }

     assert_response :success
     assert_template :authorize_failure
     assert_select "p", "The authorization token is not valid."
     assert_response :success
     assert_template :authorize_failure
     assert_select "p", "The authorization token is not valid."


@@ -127,7 +129,7 @@ class OAuthTest < ActionDispatch::IntegrationTest
     assert_nil token.authorized_at
     assert_not_nil token.invalidated_at
 
     assert_nil token.authorized_at
     assert_not_nil token.invalidated_at
 

-    post "/oauth/authorize", :oauth_token => token.token
+    post "/oauth/authorize", :params => { :oauth_token => token.token }

     assert_response :success
     assert_template :authorize_failure
     assert_select "p", "The authorization token is not valid."
     assert_response :success
     assert_template :authorize_failure
     assert_select "p", "The authorization token is not valid."


@@ -139,13 +141,13 @@ class OAuthTest < ActionDispatch::IntegrationTest
   def oauth10_with_callback(client, callback_url)
     token = get_request_token(client)
 
   def oauth10_with_callback(client, callback_url)
     token = get_request_token(client)
 

-    get "/oauth/authorize", :oauth_token => token.token
+    get "/oauth/authorize", :params => { :oauth_token => token.token }

     assert_response :success
     assert_template :authorize
 
     post "/oauth/authorize",
     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
+         :params => { :oauth_token => token.token, :oauth_callback => callback_url,
+                      :allow_write_api => true, :allow_read_gpx => true }

     assert_response :redirect
     assert_redirected_to "#{callback_url}?oauth_token=#{token.token}"
     token.reload
     assert_response :redirect
     assert_redirected_to "#{callback_url}?oauth_token=#{token.token}"
     token.reload


@@ -154,7 +156,7 @@ class OAuthTest < ActionDispatch::IntegrationTest
     assert_nil token.invalidated_at
     assert_allowed token, [:allow_write_api, :allow_read_gpx]
 
     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
     assert_response :success
     token.reload
     assert_not_nil token.created_at


@@ -167,32 +169,32 @@ class OAuthTest < ActionDispatch::IntegrationTest
     assert_nil token.invalidated_at
     assert_allowed token, [:allow_write_api, :allow_read_gpx]
 
     assert_nil token.invalidated_at
     assert_allowed token, [:allow_write_api, :allow_read_gpx]
 

-    trace = create(:trace, :user => users(:public_user))
-    signed_get "/api/0.6/gpx/#{trace.id}", :consumer => client, :token => token
+    trace = create(:trace, :user => client.user)
+    signed_get "/api/0.6/gpx/#{trace.id}", :oauth => { :token => token }

     assert_response :success
 
     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
 
     assert_response :forbidden
 

-    post "/oauth/revoke", :token => token.token
+    post "/oauth/revoke", :params => { :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
 
     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
+    signed_get "/api/0.6/gpx/2", :oauth => { :token => token }

     assert_response :unauthorized
   end
 
   def oauth10a_without_callback(client)
     token = get_request_token(client, :oauth_callback => "oob")
 
     assert_response :unauthorized
   end
 
   def oauth10a_without_callback(client)
     token = get_request_token(client, :oauth_callback => "oob")
 

-    get "/oauth/authorize", :oauth_token => token.token
+    get "/oauth/authorize", :params => { :oauth_token => token.token }

     assert_response :success
     assert_template :authorize
 
     post "/oauth/authorize",
     assert_response :success
     assert_template :authorize
 
     post "/oauth/authorize",

-         :oauth_token => token.token,
-         :allow_read_prefs => true, :allow_write_prefs => true
+         :params => { :oauth_token => token.token,
+                      :allow_read_prefs => true, :allow_write_prefs => true }

     if client.callback_url
       assert_response :redirect
       verifier = parse_verifier(response)
     if client.callback_url
       assert_response :redirect
       verifier = parse_verifier(response)


@@ -210,11 +212,10 @@ class OAuthTest < ActionDispatch::IntegrationTest
     assert_nil token.invalidated_at
     assert_allowed token, [:allow_read_prefs]
 
     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
 
     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
     assert_response :success
     token.reload
     assert_not_nil token.created_at


@@ -227,32 +228,32 @@ class OAuthTest < ActionDispatch::IntegrationTest
     assert_nil token.invalidated_at
     assert_allowed token, [:allow_read_prefs]
 
     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
 
     assert_response :success
 

-    trace = create(:trace, :user => users(:public_user))
-    signed_get "/api/0.6/gpx/#{trace.id}", :consumer => client, :token => token
+    trace = create(:trace, :user => client.user)
+    signed_get "/api/0.6/gpx/#{trace.id}", :oauth => { :token => token }

     assert_response :forbidden
 
     assert_response :forbidden
 

-    post "/oauth/revoke", :token => token.token
+    post "/oauth/revoke", :params => { :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
 
     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
+    signed_get "/api/0.6/user/preferences", :oauth => { :token => token }

     assert_response :unauthorized
   end
 
   def oauth10a_with_callback(client, callback_url)
     token = get_request_token(client, :oauth_callback => callback_url)
 
     assert_response :unauthorized
   end
 
   def oauth10a_with_callback(client, callback_url)
     token = get_request_token(client, :oauth_callback => callback_url)
 

-    get "/oauth/authorize", :oauth_token => token.token
+    get "/oauth/authorize", :params => { :oauth_token => token.token }

     assert_response :success
     assert_template :authorize
 
     post "/oauth/authorize",
     assert_response :success
     assert_template :authorize
 
     post "/oauth/authorize",

-         :oauth_token => token.token,
-         :allow_write_api => true, :allow_read_gpx => true
+         :params => { :oauth_token => token.token,
+                      :allow_write_api => true, :allow_read_gpx => true }

     assert_response :redirect
     verifier = parse_verifier(response)
     assert_redirected_to "#{callback_url}?oauth_token=#{token.token}&oauth_verifier=#{verifier}"
     assert_response :redirect
     verifier = parse_verifier(response)
     assert_redirected_to "#{callback_url}?oauth_token=#{token.token}&oauth_verifier=#{verifier}"


@@ -262,11 +263,10 @@ class OAuthTest < ActionDispatch::IntegrationTest
     assert_nil token.invalidated_at
     assert_allowed token, [:allow_write_api, :allow_read_gpx]
 
     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
 
     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
     assert_response :success
     token.reload
     assert_not_nil token.created_at


@@ -279,30 +279,30 @@ class OAuthTest < ActionDispatch::IntegrationTest
     assert_nil token.invalidated_at
     assert_allowed token, [:allow_write_api, :allow_read_gpx]
 
     assert_nil token.invalidated_at
     assert_allowed token, [:allow_write_api, :allow_read_gpx]
 

-    trace = create(:trace, :user => users(:public_user))
-    signed_get "/api/0.6/gpx/#{trace.id}", :consumer => client, :token => token
+    trace = create(:trace, :user => client.user)
+    signed_get "/api/0.6/gpx/#{trace.id}", :oauth => { :token => token }

     assert_response :success
 
     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
 
     assert_response :forbidden
 

-    post "/oauth/revoke", :token => token.token
+    post "/oauth/revoke", :params => { :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
 
     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
+    signed_get "/api/0.6/gpx/2", :oauth => { :token => token }

     assert_response :unauthorized
   end
 
   def oauth10a_refused(client)
     token = get_request_token(client, :oauth_callback => "oob")
 
     assert_response :unauthorized
   end
 
   def oauth10a_refused(client)
     token = get_request_token(client, :oauth_callback => "oob")
 

-    get "/oauth/authorize", :oauth_token => token.token
+    get "/oauth/authorize", :params => { :oauth_token => token.token }

     assert_response :success
     assert_template :authorize
 
     assert_response :success
     assert_template :authorize
 

-    post "/oauth/authorize", :oauth_token => token.token
+    post "/oauth/authorize", :params => { :oauth_token => token.token }

     assert_response :success
     assert_template :authorize_failure
     assert_select "p", "You have denied application #{client.name} access to your account."
     assert_response :success
     assert_template :authorize_failure
     assert_select "p", "You have denied application #{client.name} access to your account."


@@ -310,7 +310,7 @@ class OAuthTest < ActionDispatch::IntegrationTest
     assert_nil token.authorized_at
     assert_not_nil token.invalidated_at
 
     assert_nil token.authorized_at
     assert_not_nil token.invalidated_at
 

-    get "/oauth/authorize", :oauth_token => token.token
+    get "/oauth/authorize", :params => { :oauth_token => token.token }

     assert_response :success
     assert_template :authorize_failure
     assert_select "p", "The authorization token is not valid."
     assert_response :success
     assert_template :authorize_failure
     assert_select "p", "The authorization token is not valid."


@@ -318,7 +318,7 @@ class OAuthTest < ActionDispatch::IntegrationTest
     assert_nil token.authorized_at
     assert_not_nil token.invalidated_at
 
     assert_nil token.authorized_at
     assert_not_nil token.invalidated_at
 

-    post "/oauth/authorize", :oauth_token => token.token
+    post "/oauth/authorize", :params => { :oauth_token => token.token }

     assert_response :success
     assert_template :authorize_failure
     assert_select "p", "The authorization token is not valid."
     assert_response :success
     assert_template :authorize_failure
     assert_select "p", "The authorization token is not valid."


@@ -328,7 +328,7 @@ class OAuthTest < ActionDispatch::IntegrationTest
   end
 
   def get_request_token(client, options = {})
   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
     assert_response :success
     token = parse_token(response)
     assert_instance_of RequestToken, token


@@ -341,24 +341,6 @@ class OAuthTest < ActionDispatch::IntegrationTest
     token
   end
 
     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)
 
   def parse_token(response)
     params = CGI.parse(response.body)