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 aed52f77c988ef659af33635db5fc254a5c82ab5..3242df9e2619d96878c13cc96fd4ca561724073a 100644 (file)
--- a/test/integration/oauth_test.rb
+++ b/test/integration/oauth_test.rb
@@ -1,26 +1,27 @@
 require "test_helper"
 
 class OAuthTest < ActionDispatch::IntegrationTest
-  fixtures :users, :client_applications, :gpx_files
-  set_fixture_class :gpx_files => Trace
-
   include OAuth::Helper
 
   def test_oauth10_web_app
-    client = client_applications(:oauth_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_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)
-    oauth10_with_callback(client, "http://another.web.app.org/callback")
+    oauth10_with_callback(client, "http://another.web.app.example.org/callback")
     oauth10_refused(client)
   end
 
   def test_oauth10_desktop_app
-    client = client_applications(:oauth_desktop_app)
+    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)
@@ -28,20 +29,24 @@ class OAuthTest < ActionDispatch::IntegrationTest
   end
 
   def test_oauth10a_web_app
-    client = client_applications(:oauth_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_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)
-    oauth10a_with_callback(client, "http://another.web.app.org/callback")
+    oauth10a_with_callback(client, "http://another.web.app.example.org/callback")
     oauth10a_refused(client)
   end
 
   def test_oauth10a_desktop_app
-    client = client_applications(:oauth_desktop_app)
+    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)
@@ -53,13 +58,13 @@ class OAuthTest < ActionDispatch::IntegrationTest
   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",
-         :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}"
@@ -73,7 +78,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
@@ -86,29 +91,29 @@ 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", :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)
+    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)
 
-    get "/oauth/authorize", :oauth_token => token.token
+    get "/oauth/authorize", :params => { :oauth_token => token.token }
     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."
@@ -116,7 +121,7 @@ class OAuthTest < ActionDispatch::IntegrationTest
     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."
@@ -124,7 +129,7 @@ class OAuthTest < ActionDispatch::IntegrationTest
     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."
@@ -136,13 +141,13 @@ class OAuthTest < ActionDispatch::IntegrationTest
   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",
-         :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
@@ -151,7 +156,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
@@ -164,35 +169,36 @@ class OAuthTest < ActionDispatch::IntegrationTest
     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
+    trace = create(:trace, :user => client.user)
+    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", :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)
+    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")
 
-    get "/oauth/authorize", :oauth_token => token.token
+    get "/oauth/authorize", :params => { :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
+         :params => { :oauth_token => token.token,
+                      :allow_read_prefs => true, :allow_write_prefs => true }
     if client.callback_url
       assert_response :redirect
       verifier = parse_verifier(response)
-      assert_redirected_to "http://some.web.app.org/callback?oauth_token=#{token.token}&oauth_verifier=#{verifier}"
+      assert_redirected_to "http://some.web.app.example.org/callback?oauth_token=#{token.token}&oauth_verifier=#{verifier}"
     else
       assert_response :success
       assert_template :authorize_success
@@ -206,11 +212,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
@@ -223,31 +228,32 @@ 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
+    trace = create(:trace, :user => client.user)
+    signed_get "/api/0.6/gpx/#{trace.id}", :oauth => { :token => token }
     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)
+    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)
 
-    get "/oauth/authorize", :oauth_token => token.token
+    get "/oauth/authorize", :params => { :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
+         :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}"
@@ -257,11 +263,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
@@ -274,29 +279,30 @@ class OAuthTest < ActionDispatch::IntegrationTest
     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
+    trace = create(:trace, :user => client.user)
+    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", :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)
+    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")
 
-    get "/oauth/authorize", :oauth_token => token.token
+    get "/oauth/authorize", :params => { :oauth_token => token.token }
     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."
@@ -304,7 +310,7 @@ class OAuthTest < ActionDispatch::IntegrationTest
     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."
@@ -312,7 +318,7 @@ class OAuthTest < ActionDispatch::IntegrationTest
     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."
@@ -322,40 +328,23 @@ 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
     assert_not_nil token.created_at
     assert_nil token.authorized_at
     assert_nil token.invalidated_at
+    assert_equal_allowing_nil options[:oauth_callback], token.callback_url
     assert_allowed token, client.permissions
 
     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)
 
-    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