Merge pull request #4193 from AntonKhorev/lookup-friend

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

diff --git a/test/integration/oauth_test.rb b/test/integration/oauth_test.rb
index 7ccf0917eba04b4ab07acd9c923a53b9ca3d3224..70f161fc9e2a9fb7cacf810ae733789dbcffd36e 100644 (file)
--- a/test/integration/oauth_test.rb
+++ b/test/integration/oauth_test.rb
@@ -1,38 +1,76 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require "test_helper"

 
 class OAuthTest < ActionDispatch::IntegrationTest
 
 class OAuthTest < ActionDispatch::IntegrationTest

-  fixtures :users, :client_applications, :gpx_files
-

   include OAuth::Helper
 
   def test_oauth10_web_app
   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)
+    user = create(:user)

 
 

-    post_via_redirect "/login", 
-      :username => client.user.email, :password => "test"
-    assert_response :success
+    session_for(user)
+
+    oauth10_without_callback(client)
+    oauth10_with_callback(client, "http://another.web.app.example.org/callback")
+    oauth10_refused(client)
+  end
+
+  def test_oauth10_desktop_app
+    client = create(:client_application, :allow_read_prefs => true, :allow_write_api => true, :allow_read_gpx => true)
+    user = create(:user)
+
+    session_for(user)
+
+    oauth10_without_callback(client)
+    oauth10_refused(client)
+  end
+
+  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)
+    user = create(:user)
+
+    session_for(user)
+
+    oauth10a_without_callback(client)
+    oauth10a_with_callback(client, "http://another.web.app.example.org/callback")
+    oauth10a_refused(client)
+  end
+
+  def test_oauth10a_desktop_app
+    client = create(:client_application, :allow_read_prefs => true, :allow_write_api => true, :allow_read_gpx => true)
+    user = create(:user)
+
+    session_for(user)
+
+    oauth10a_without_callback(client)
+    oauth10a_refused(client)
+  end
+
+  private

 
 

-    signed_get "/oauth/request_token", :consumer => client
+  def oauth10_without_callback(client)
+    token = get_request_token(client)
+
+    get "/oauth/authorize", :params => { :oauth_token => token.token }

     assert_response :success
     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_allowed token, client.permissions
+    assert_template :authorize

 
 

-    post "/oauth/authorize", 
-      :oauth_token => token.token, 
-      :allow_read_prefs => true, :allow_write_prefs => true
-    assert_response :redirect
-    assert_redirected_to "http://some.web.app.org/callback?oauth_token=#{token.token}"
+    post "/oauth/authorize",
+         :params => { :oauth_token => token.token,
+                      :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}"
+    else
+      assert_response :success
+      assert_template :authorize_success
+    end

     token.reload
     assert_not_nil token.created_at
     assert_not_nil token.authorized_at
     assert_nil token.invalidated_at
     token.reload
     assert_not_nil token.created_at
     assert_not_nil token.authorized_at
     assert_nil token.invalidated_at

-    assert_allowed token, [ :allow_read_prefs ]
+    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


@@ -43,93 +81,90 @@ class OAuthTest < ActionDispatch::IntegrationTest
     assert_not_nil token.created_at
     assert_not_nil token.authorized_at
     assert_nil token.invalidated_at
     assert_not_nil token.created_at
     assert_not_nil token.authorized_at
     assert_nil token.invalidated_at

-    assert_allowed token, [ :allow_read_prefs ]
+    assert_allowed token, [:allow_read_prefs]

 
 

-    signed_get "/api/0.6/user/preferences", :consumer => client, :token => token
+    post logout_path
+
+    signed_get "/api/0.6/user/preferences", :oauth => { :token => token }
+    assert_response :success
+
+    signed_get "/api/0.6/gpx/2", :oauth => { :token => token }
+    assert_response :forbidden
+
+    token.user.suspend!
+    signed_get "/api/0.6/user/preferences", :oauth => { :token => token }
+    assert_response :forbidden
+
+    token.user.hide!
+    signed_get "/api/0.6/user/preferences", :oauth => { :token => token }
+    assert_response :forbidden
+
+    token.user.unhide!
+    signed_get "/api/0.6/user/preferences", :oauth => { :token => token }

     assert_response :success
 
     assert_response :success
 

-    post "/oauth/revoke", :token => token.token
+    session_for(token.user)
+
+    post "/oauth/revoke", :params => { :token => token.token }

     assert_redirected_to oauth_clients_url(token.user.display_name)
     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
 
     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
     assert_response :unauthorized

+  end

 
 

-    signed_get "/oauth/request_token", :consumer => client
+  def oauth10_refused(client)
+    token = get_request_token(client)
+
+    get "/oauth/authorize", :params => { :oauth_token => token.token }

     assert_response :success
     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_allowed token, client.permissions
+    assert_template :authorize

 
 

-    post "/oauth/authorize", 
-      :oauth_token => token.token, 
-      :oauth_callback => "http://another.web.app.org/callback", 
-      :allow_write_api => true, :allow_read_gpx => true
-    assert_response :redirect
-    assert_redirected_to "http://another.web.app.org/callback?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."

     token.reload
     token.reload

-    assert_not_nil token.created_at
-    assert_not_nil token.authorized_at
-    assert_nil token.invalidated_at
-    assert_allowed token, [ :allow_write_api, :allow_read_gpx ]
+    assert_nil token.authorized_at
+    assert_not_nil token.invalidated_at

 
 

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

     assert_response :success
     assert_response :success

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

     token.reload
     token.reload

-    assert_not_nil token.created_at
-    assert_not_nil token.authorized_at
+    assert_nil token.authorized_at

     assert_not_nil token.invalidated_at
     assert_not_nil token.invalidated_at

-    token = parse_token(response)
-    assert_instance_of AccessToken, token
-    assert_not_nil token.created_at
-    assert_not_nil token.authorized_at
-    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
+    post "/oauth/authorize", :params => { :oauth_token => token.token }

     assert_response :success
     assert_response :success

-
-    post "/oauth/revoke", :token => token.token
-    assert_redirected_to oauth_clients_url(token.user.display_name)
-    token = OauthToken.find_by_token(token.token)
+    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
     assert_not_nil token.invalidated_at

-
-    signed_get "/api/0.6/gpx/2", :consumer => client, :token => token
-    assert_response :unauthorized

   end
 
   end
 

-  def test_oauth10_desktop_app
-    client = client_applications(:oauth_desktop_app)
+  def oauth10_with_callback(client, callback_url)
+    token = get_request_token(client)

 
 

-    post_via_redirect "/login", 
-      :username => client.user.email, :password => "test"
+    get "/oauth/authorize", :params => { :oauth_token => token.token }

     assert_response :success
     assert_response :success

+    assert_template :authorize

 
 

-    signed_get "/oauth/request_token", :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_allowed token, client.permissions
-
-    post "/oauth/authorize", 
-      :oauth_token => token.token, 
-      :allow_read_prefs => true, :allow_write_prefs => true
-    assert_response :success
-    assert_template "authorize_success"
+    post "/oauth/authorize",
+         :params => { :oauth_token => token.token, :oauth_callback => callback_url,
+                      :allow_write_api => "1", :allow_read_gpx => "1" }
+    assert_response :redirect
+    assert_redirected_to "#{callback_url}?oauth_token=#{token.token}"

     token.reload
     assert_not_nil token.created_at
     assert_not_nil token.authorized_at
     assert_nil token.invalidated_at
     token.reload
     assert_not_nil token.created_at
     assert_not_nil token.authorized_at
     assert_nil token.invalidated_at

-    assert_allowed token, [ :allow_read_prefs ]
+    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


@@ -140,54 +175,71 @@ class OAuthTest < ActionDispatch::IntegrationTest
     assert_not_nil token.created_at
     assert_not_nil token.authorized_at
     assert_nil token.invalidated_at
     assert_not_nil token.created_at
     assert_not_nil token.authorized_at
     assert_nil token.invalidated_at

-    assert_allowed token, [ :allow_read_prefs ]
+    assert_allowed token, [:allow_write_api, :allow_read_gpx]

 
 

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

     assert_response :success
 
     assert_response :success
 

-    post "/oauth/revoke", :token => token.token
+    signed_get "/api/0.6/user/details", :oauth => { :token => token }
+    assert_response :forbidden
+
+    token.user.suspend!
+    signed_get "/api/0.6/gpx/#{trace.id}", :oauth => { :token => token }
+    assert_response :forbidden
+
+    token.user.hide!
+    signed_get "/api/0.6/gpx/#{trace.id}", :oauth => { :token => token }
+    assert_response :forbidden
+
+    token.user.unhide!
+    signed_get "/api/0.6/gpx/#{trace.id}", :oauth => { :token => token }
+    assert_response :success
+
+    session_for(token.user)
+
+    post "/oauth/revoke", :params => { :token => token.token }

     assert_redirected_to oauth_clients_url(token.user.display_name)
     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
 
     assert_not_nil token.invalidated_at
 

-    signed_get "/api/0.6/user/preferences", :consumer => client, :token => token
+    signed_get "/api/0.6/gpx/2", :oauth => { :token => token }

     assert_response :unauthorized
   end
 
     assert_response :unauthorized
   end
 

-  def test_oauth10a_web_app
-    client = client_applications(:oauth_web_app)
-
-    post_via_redirect "/login",
-      :username => client.user.email, :password => "test"
-    assert_response :success
+  def oauth10a_without_callback(client)
+    token = get_request_token(client, :oauth_callback => "oob")

 
 

-    signed_get "/oauth/request_token",
-      :consumer => client, :oauth_callback => "oob"
+    get "/oauth/authorize", :params => { :oauth_token => token.token }

     assert_response :success
     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_allowed token, client.permissions
+    assert_template :authorize

 
     post "/oauth/authorize",
 
     post "/oauth/authorize",

-      :oauth_token => token.token,
-      :allow_read_prefs => true, :allow_write_prefs => true
-    assert_response :redirect
-    verifier = parse_verifier(response)
-    assert_redirected_to "http://some.web.app.org/callback?oauth_token=#{token.token}&oauth_verifier=#{verifier}"
+         :params => { :oauth_token => token.token,
+                      :allow_read_prefs => "1", :allow_write_prefs => "1" }
+    if client.callback_url
+      assert_response :redirect
+      verifier = parse_verifier(response)
+      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
+      m = response.body.match("<p>The verification code is ([A-Za-z0-9]+).</p>")
+      assert_not_nil m
+      verifier = m[1]
+    end

     token.reload
     assert_not_nil token.created_at
     assert_not_nil token.authorized_at
     assert_nil token.invalidated_at
     token.reload
     assert_not_nil token.created_at
     assert_not_nil token.authorized_at
     assert_nil token.invalidated_at

-    assert_allowed token, [ :allow_read_prefs ]
+    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


@@ -198,47 +250,63 @@ class OAuthTest < ActionDispatch::IntegrationTest
     assert_not_nil token.created_at
     assert_not_nil token.authorized_at
     assert_nil token.invalidated_at
     assert_not_nil token.created_at
     assert_not_nil token.authorized_at
     assert_nil token.invalidated_at

-    assert_allowed token, [ :allow_read_prefs ]
+    assert_allowed token, [:allow_read_prefs]
+
+    post logout_path
+
+    signed_get "/api/0.6/user/preferences", :oauth => { :token => token }
+    assert_response :success

 
 

-    signed_get "/api/0.6/user/preferences", :consumer => client, :token => token
+    trace = create(:trace, :user => token.user)
+    signed_get "/api/0.6/gpx/#{trace.id}", :oauth => { :token => token }
+    assert_response :forbidden
+
+    token.user.suspend!
+    signed_get "/api/0.6/user/preferences", :oauth => { :token => token }
+    assert_response :forbidden
+
+    token.user.hide!
+    signed_get "/api/0.6/user/preferences", :oauth => { :token => token }
+    assert_response :forbidden
+
+    token.user.unhide!
+    signed_get "/api/0.6/user/preferences", :oauth => { :token => token }

     assert_response :success
 
     assert_response :success
 

-    post "/oauth/revoke", :token => token.token
+    session_for(token.user)
+
+    post "/oauth/revoke", :params => { :token => token.token }

     assert_redirected_to oauth_clients_url(token.user.display_name)
     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
 
     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
     assert_response :unauthorized

+  end

 
 

-    signed_get "/oauth/request_token",
-      :consumer => client,
-      :oauth_callback => "http://another.web.app.org/callback"
+  def oauth10a_with_callback(client, callback_url)
+    token = get_request_token(client, :oauth_callback => callback_url)
+
+    get "/oauth/authorize", :params => { :oauth_token => token.token }

     assert_response :success
     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_allowed token, client.permissions
+    assert_template :authorize

 
     post "/oauth/authorize",
 
     post "/oauth/authorize",

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

     assert_response :redirect
     verifier = parse_verifier(response)
     assert_response :redirect
     verifier = parse_verifier(response)

-    assert_redirected_to "http://another.web.app.org/callback?oauth_token=#{token.token}&oauth_verifier=#{verifier}"
+    assert_redirected_to "#{callback_url}?oauth_token=#{token.token}&oauth_verifier=#{verifier}"

     token.reload
     assert_not_nil token.created_at
     assert_not_nil token.authorized_at
     assert_nil token.invalidated_at
     token.reload
     assert_not_nil token.created_at
     assert_not_nil token.authorized_at
     assert_nil token.invalidated_at

-    assert_allowed token, [ :allow_write_api, :allow_read_gpx ]
+    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


@@ -249,104 +317,90 @@ class OAuthTest < ActionDispatch::IntegrationTest
     assert_not_nil token.created_at
     assert_not_nil token.authorized_at
     assert_nil token.invalidated_at
     assert_not_nil token.created_at
     assert_not_nil token.authorized_at
     assert_nil token.invalidated_at

-    assert_allowed token, [ :allow_write_api, :allow_read_gpx ]
+    assert_allowed token, [:allow_write_api, :allow_read_gpx]
+
+    post logout_path
+
+    trace = create(:trace, :user => token.user)
+    signed_get "/api/0.6/gpx/#{trace.id}", :oauth => { :token => token }
+    assert_response :success

 
 

-    signed_get "/api/0.6/gpx/2", :consumer => client, :token => token
+    signed_get "/api/0.6/user/details", :oauth => { :token => token }
+    assert_response :forbidden
+
+    token.user.suspend!
+    signed_get "/api/0.6/gpx/#{trace.id}", :oauth => { :token => token }
+    assert_response :forbidden
+
+    token.user.hide!
+    signed_get "/api/0.6/gpx/#{trace.id}", :oauth => { :token => token }
+    assert_response :forbidden
+
+    token.user.unhide!
+    signed_get "/api/0.6/gpx/#{trace.id}", :oauth => { :token => token }

     assert_response :success
 
     assert_response :success
 

-    post "/oauth/revoke", :token => token.token
+    session_for(token.user)
+
+    post "/oauth/revoke", :params => { :token => token.token }

     assert_redirected_to oauth_clients_url(token.user.display_name)
     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
 
     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
 

-  def test_oauth10a_desktop_app
-    client = client_applications(:oauth_desktop_app)
+  def oauth10a_refused(client)
+    token = get_request_token(client, :oauth_callback => "oob")

 
 

-    post_via_redirect "/login", 
-      :username => client.user.email, :password => "test"
+    get "/oauth/authorize", :params => { :oauth_token => token.token }

     assert_response :success
     assert_response :success

+    assert_template :authorize

 
 

-    signed_get "/oauth/request_token",
-      :consumer => client, :oauth_callback => "oob"
+    post "/oauth/authorize", :params => { :oauth_token => token.token }

     assert_response :success
     assert_response :success

-    token = parse_token(response)
-    assert_instance_of RequestToken, token
-    assert_not_nil token.created_at
+    assert_template :authorize_failure
+    assert_select "p", "You have denied application #{client.name} access to your account."
+    token.reload

     assert_nil token.authorized_at
     assert_nil token.authorized_at

-    assert_nil token.invalidated_at
-    assert_allowed token, client.permissions
+    assert_not_nil token.invalidated_at

 
 

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

     assert_response :success
     assert_response :success

-    assert_template "authorize_success"
-    m = response.body.match("<p>The verification code is ([A-Za-z0-9]+)</p>")
-    assert_not_nil m
-    verifier = m[1]
+    assert_template :authorize_failure
+    assert_select "p", "The authorization token is not valid."

     token.reload
     token.reload

-    assert_not_nil token.created_at
-    assert_not_nil token.authorized_at
-    assert_nil token.invalidated_at
-    assert_allowed token, [ :allow_read_prefs ]
-
-    signed_get "/oauth/access_token", :consumer => client, :token => token
-    assert_response :unauthorized
+    assert_nil token.authorized_at
+    assert_not_nil token.invalidated_at

 
 

-    signed_get "/oauth/access_token",
-      :consumer => client, :token => token, :oauth_verifier => verifier
+    post "/oauth/authorize", :params => { :oauth_token => token.token }

     assert_response :success
     assert_response :success

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

     token.reload
     token.reload

-    assert_not_nil token.created_at
-    assert_not_nil token.authorized_at
+    assert_nil token.authorized_at

     assert_not_nil token.invalidated_at
     assert_not_nil token.invalidated_at

+  end
+
+  def get_request_token(client, options = {})
+    signed_get "/oauth/request_token", :oauth => options.merge(:consumer => client)
+    assert_response :success

     token = parse_token(response)
     token = parse_token(response)

-    assert_instance_of AccessToken, token
+    assert_instance_of RequestToken, token

     assert_not_nil token.created_at
     assert_not_nil token.created_at

-    assert_not_nil token.authorized_at
+    assert_nil token.authorized_at

     assert_nil token.invalidated_at
     assert_nil token.invalidated_at

-    assert_allowed token, [ :allow_read_prefs ]
-
-    signed_get "/api/0.6/user/preferences", :consumer => client, :token => token
-    assert_response :success
-
-    post "/oauth/revoke", :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
-
-    signed_get "/api/0.6/user/preferences", :consumer => client, :token => token
-    assert_response :unauthorized
-  end
-
-private
-
-  def signed_get(uri, options)
-    uri = URI.parse(uri)
-    uri.scheme ||= "http"
-    uri.host ||= host
-
-    helper = OAuth::Client::Helper.new(nil, options)
-
-    request = OAuth::RequestProxy.proxy(
-      "method" => "GET",
-      "uri" => uri,
-      "parameters" => helper.oauth_parameters
-    )
-
-    request.sign!(options)
+    assert_equal_allowing_nil options[:oauth_callback], token.callback_url
+    assert_allowed token, client.permissions

 
 

-    get request.signed_uri
+    token

   end
 
   def parse_token(response)
     params = CGI.parse(response.body)
 
   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
     assert_equal token.secret, params["oauth_token_secret"].first
 
     token


@@ -356,7 +410,7 @@ private
     params = CGI.parse(URI.parse(response.location).query)
 
     assert_not_nil params["oauth_verifier"]
     params = CGI.parse(URI.parse(response.location).query)
 
     assert_not_nil params["oauth_verifier"]

-    assert params["oauth_verifier"].first.present?
+    assert_predicate params["oauth_verifier"].first, :present?

 
     params["oauth_verifier"].first
   end
 
     params["oauth_verifier"].first
   end