Actually use user_block

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

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

-  fixtures :users, :client_applications, :gpx_files
-  set_fixture_class :gpx_files => Trace
+  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 = client_applications(:oauth_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)

 
     post_via_redirect "/login", :username => client.user.email, :password => "test"
     assert_response :success
 
     oauth10_without_callback(client)
 
     post_via_redirect "/login", :username => client.user.email, :password => "test"
     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
     oauth10_refused(client)
   end
 
   def test_oauth10_desktop_app

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

 
     post_via_redirect "/login", :username => client.user.email, :password => "test"
     assert_response :success
 
     post_via_redirect "/login", :username => client.user.email, :password => "test"
     assert_response :success


@@ -28,18 +31,18 @@ class OAuthTest < ActionDispatch::IntegrationTest
   end
 
   def test_oauth10a_web_app
   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", :user => users(:public_user), :allow_read_prefs => true, :allow_write_api => true, :allow_read_gpx => true)

 
     post_via_redirect "/login", :username => client.user.email, :password => "test"
     assert_response :success
 
     oauth10a_without_callback(client)
 
     post_via_redirect "/login", :username => client.user.email, :password => "test"
     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
     oauth10a_refused(client)
   end
 
   def test_oauth10a_desktop_app

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

 
     post_via_redirect "/login", :username => client.user.email, :password => "test"
     assert_response :success
 
     post_via_redirect "/login", :username => client.user.email, :password => "test"
     assert_response :success


@@ -53,6 +56,10 @@ 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
+    assert_response :success
+    assert_template :authorize
+

     post "/oauth/authorize",
          :oauth_token => token.token,
          :allow_read_prefs => true, :allow_write_prefs => true
     post "/oauth/authorize",
          :oauth_token => token.token,
          :allow_read_prefs => true, :allow_write_prefs => true


@@ -90,7 +97,7 @@ class OAuthTest < ActionDispatch::IntegrationTest
 
     post "/oauth/revoke", :token => token.token
     assert_redirected_to oauth_clients_url(token.user.display_name)
 
     post "/oauth/revoke", :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
     assert_not_nil token.invalidated_at
 
     signed_get "/api/0.6/user/preferences", :consumer => client, :token => token


@@ -100,6 +107,10 @@ class OAuthTest < ActionDispatch::IntegrationTest
   def oauth10_refused(client)
     token = get_request_token(client)
 
   def oauth10_refused(client)
     token = get_request_token(client)
 

+    get "/oauth/authorize", :oauth_token => token.token
+    assert_response :success
+    assert_template :authorize
+

     post "/oauth/authorize", :oauth_token => token.token
     assert_response :success
     assert_template :authorize_failure
     post "/oauth/authorize", :oauth_token => token.token
     assert_response :success
     assert_template :authorize_failure


@@ -108,6 +119,14 @@ 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
+    assert_response :success
+    assert_template :authorize_failure
+    assert_select "p", "The authorization token is not valid."
+    token.reload
+    assert_nil token.authorized_at
+    assert_not_nil token.invalidated_at
+

     post "/oauth/authorize", :oauth_token => token.token
     assert_response :success
     assert_template :authorize_failure
     post "/oauth/authorize", :oauth_token => token.token
     assert_response :success
     assert_template :authorize_failure


@@ -120,6 +139,10 @@ 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
+    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
     post "/oauth/authorize",
          :oauth_token => token.token, :oauth_callback => callback_url,
          :allow_write_api => true, :allow_read_gpx => true


@@ -144,7 +167,8 @@ 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 "/api/0.6/gpx/2", :consumer => client, :token => token
+    trace = create(:trace, :user => users(:public_user))
+    signed_get "/api/0.6/gpx/#{trace.id}", :consumer => client, :token => token

     assert_response :success
 
     signed_get "/api/0.6/user/details", :consumer => client, :token => token
     assert_response :success
 
     signed_get "/api/0.6/user/details", :consumer => client, :token => token


@@ -152,7 +176,7 @@ class OAuthTest < ActionDispatch::IntegrationTest
 
     post "/oauth/revoke", :token => token.token
     assert_redirected_to oauth_clients_url(token.user.display_name)
 
     post "/oauth/revoke", :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
     assert_not_nil token.invalidated_at
 
     signed_get "/api/0.6/gpx/2", :consumer => client, :token => token


@@ -162,13 +186,17 @@ class OAuthTest < ActionDispatch::IntegrationTest
   def oauth10a_without_callback(client)
     token = get_request_token(client, :oauth_callback => "oob")
 
   def oauth10a_without_callback(client)
     token = get_request_token(client, :oauth_callback => "oob")
 

+    get "/oauth/authorize", :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
     if client.callback_url
       assert_response :redirect
       verifier = parse_verifier(response)
     post "/oauth/authorize",
          :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
     else
       assert_response :success
       assert_template :authorize_success


@@ -202,12 +230,13 @@ class OAuthTest < ActionDispatch::IntegrationTest
     signed_get "/api/0.6/user/preferences", :consumer => client, :token => token
     assert_response :success
 
     signed_get "/api/0.6/user/preferences", :consumer => client, :token => token
     assert_response :success
 

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

     assert_response :forbidden
 
     post "/oauth/revoke", :token => token.token
     assert_redirected_to oauth_clients_url(token.user.display_name)
     assert_response :forbidden
 
     post "/oauth/revoke", :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
     assert_not_nil token.invalidated_at
 
     signed_get "/api/0.6/user/preferences", :consumer => client, :token => token


@@ -217,6 +246,10 @@ class OAuthTest < ActionDispatch::IntegrationTest
   def oauth10a_with_callback(client, callback_url)
     token = get_request_token(client, :oauth_callback => callback_url)
 
   def oauth10a_with_callback(client, callback_url)
     token = get_request_token(client, :oauth_callback => callback_url)
 

+    get "/oauth/authorize", :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
     post "/oauth/authorize",
          :oauth_token => token.token,
          :allow_write_api => true, :allow_read_gpx => true


@@ -246,7 +279,8 @@ 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 "/api/0.6/gpx/2", :consumer => client, :token => token
+    trace = create(:trace, :user => users(:public_user))
+    signed_get "/api/0.6/gpx/#{trace.id}", :consumer => client, :token => token

     assert_response :success
 
     signed_get "/api/0.6/user/details", :consumer => client, :token => token
     assert_response :success
 
     signed_get "/api/0.6/user/details", :consumer => client, :token => token


@@ -254,7 +288,7 @@ class OAuthTest < ActionDispatch::IntegrationTest
 
     post "/oauth/revoke", :token => token.token
     assert_redirected_to oauth_clients_url(token.user.display_name)
 
     post "/oauth/revoke", :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
     assert_not_nil token.invalidated_at
 
     signed_get "/api/0.6/gpx/2", :consumer => client, :token => token


@@ -264,6 +298,10 @@ class OAuthTest < ActionDispatch::IntegrationTest
   def oauth10a_refused(client)
     token = get_request_token(client, :oauth_callback => "oob")
 
   def oauth10a_refused(client)
     token = get_request_token(client, :oauth_callback => "oob")
 

+    get "/oauth/authorize", :oauth_token => token.token
+    assert_response :success
+    assert_template :authorize
+

     post "/oauth/authorize", :oauth_token => token.token
     assert_response :success
     assert_template :authorize_failure
     post "/oauth/authorize", :oauth_token => token.token
     assert_response :success
     assert_template :authorize_failure


@@ -272,6 +310,14 @@ 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
+    assert_response :success
+    assert_template :authorize_failure
+    assert_select "p", "The authorization token is not valid."
+    token.reload
+    assert_nil token.authorized_at
+    assert_not_nil token.invalidated_at
+

     post "/oauth/authorize", :oauth_token => token.token
     assert_response :success
     assert_template :authorize_failure
     post "/oauth/authorize", :oauth_token => token.token
     assert_response :success
     assert_template :authorize_failure


@@ -289,6 +335,7 @@ class OAuthTest < ActionDispatch::IntegrationTest
     assert_not_nil token.created_at
     assert_nil token.authorized_at
     assert_nil token.invalidated_at
     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
     assert_allowed token, client.permissions
 
     token


@@ -315,7 +362,7 @@ class OAuthTest < ActionDispatch::IntegrationTest
   def parse_token(response)
     params = CGI.parse(response.body)
 
   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
     assert_equal token.secret, params["oauth_token_secret"].first
 
     token