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 60e1db24d8e63b62b860bed413490c8a54eb8965..3242df9e2619d96878c13cc96fd4ca561724073a 100644 (file)
--- a/test/integration/oauth_test.rb
+++ b/test/integration/oauth_test.rb
@@ -3,10 +3,6 @@ require "test_helper"
 class OAuthTest < ActionDispatch::IntegrationTest
   include OAuth::Helper
 
 class OAuthTest < ActionDispatch::IntegrationTest
   include OAuth::Helper
 

-  def setup
-    stub_hostip_requests
-  end
-

   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)
 
   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)
 


@@ -82,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


@@ -95,10 +91,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 "/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
 
     post "/oauth/revoke", :params => { :token => token.token }
     assert_response :forbidden
 
     post "/oauth/revoke", :params => { :token => token.token }


@@ -106,7 +102,7 @@ class OAuthTest < ActionDispatch::IntegrationTest
     token = OauthToken.find_by(:token => token.token)
     assert_not_nil token.invalidated_at
 
     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
 
     assert_response :unauthorized
   end
 


@@ -160,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


@@ -174,10 +170,10 @@ class OAuthTest < ActionDispatch::IntegrationTest
     assert_allowed token, [:allow_write_api, :allow_read_gpx]
 
     trace = create(:trace, :user => client.user)
     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
 
     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 }
     assert_response :forbidden
 
     post "/oauth/revoke", :params => { :token => token.token }


@@ -185,7 +181,7 @@ class OAuthTest < ActionDispatch::IntegrationTest
     token = OauthToken.find_by(:token => token.token)
     assert_not_nil token.invalidated_at
 
     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
 
     assert_response :unauthorized
   end
 


@@ -216,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


@@ -233,11 +228,11 @@ 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
 
     trace = create(:trace, :user => client.user)
     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 }
     assert_response :forbidden
 
     post "/oauth/revoke", :params => { :token => token.token }


@@ -245,7 +240,7 @@ class OAuthTest < ActionDispatch::IntegrationTest
     token = OauthToken.find_by(:token => token.token)
     assert_not_nil token.invalidated_at
 
     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
 
     assert_response :unauthorized
   end
 


@@ -268,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


@@ -286,10 +280,10 @@ class OAuthTest < ActionDispatch::IntegrationTest
     assert_allowed token, [:allow_write_api, :allow_read_gpx]
 
     trace = create(:trace, :user => client.user)
     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
 
     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 }
     assert_response :forbidden
 
     post "/oauth/revoke", :params => { :token => token.token }


@@ -297,7 +291,7 @@ class OAuthTest < ActionDispatch::IntegrationTest
     token = OauthToken.find_by(:token => token.token)
     assert_not_nil token.invalidated_at
 
     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
 
     assert_response :unauthorized
   end
 


@@ -334,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


@@ -347,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)