Controllers + a few tests + new notification added. Work pending on the notification...

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

diff --git a/test/integration/oauth_test.rb b/test/integration/oauth_test.rb
index bcadc21b839ea00621f00d03c0fbd43e2595bf14..32314703021ccafac736f9e0f60d0f1e0842247e 100644 (file)
--- a/test/integration/oauth_test.rb
+++ b/test/integration/oauth_test.rb
@@ -14,6 +14,7 @@ class OAuthTest < ActionDispatch::IntegrationTest
 
     oauth10_without_callback(client)
     oauth10_with_callback(client, "http://another.web.app.org/callback")
+    oauth10_refused(client)
   end
 
   def test_oauth10_desktop_app
@@ -23,6 +24,7 @@ class OAuthTest < ActionDispatch::IntegrationTest
     assert_response :success
 
     oauth10_without_callback(client)
+    oauth10_refused(client)
   end
 
   def test_oauth10a_web_app
@@ -33,6 +35,7 @@ class OAuthTest < ActionDispatch::IntegrationTest
 
     oauth10a_without_callback(client)
     oauth10a_with_callback(client, "http://another.web.app.org/callback")
+    oauth10a_refused(client)
   end
 
   def test_oauth10a_desktop_app
@@ -42,6 +45,7 @@ class OAuthTest < ActionDispatch::IntegrationTest
     assert_response :success
 
     oauth10a_without_callback(client)
+    oauth10a_refused(client)
   end
 
   private
@@ -49,6 +53,10 @@ class OAuthTest < ActionDispatch::IntegrationTest
   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
@@ -57,7 +65,7 @@ class OAuthTest < ActionDispatch::IntegrationTest
       assert_redirected_to "#{client.callback_url}?oauth_token=#{token.token}"
     else
       assert_response :success
-      assert_template "authorize_success"
+      assert_template :authorize_success
     end
     token.reload
     assert_not_nil token.created_at
@@ -93,9 +101,45 @@ class OAuthTest < ActionDispatch::IntegrationTest
     assert_response :unauthorized
   end
 
+  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
+    assert_select "p", "You have denied application #{client.name} access to your account."
+    token.reload
+    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
+    assert_select "p", "The authorization token is not valid."
+    token.reload
+    assert_nil token.authorized_at
+    assert_not_nil token.invalidated_at
+  end
+
   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
@@ -138,6 +182,10 @@ class OAuthTest < ActionDispatch::IntegrationTest
   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
@@ -147,7 +195,7 @@ class OAuthTest < ActionDispatch::IntegrationTest
       assert_redirected_to "http://some.web.app.org/callback?oauth_token=#{token.token}&oauth_verifier=#{verifier}"
     else
       assert_response :success
-      assert_template "authorize_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]
@@ -193,6 +241,10 @@ class OAuthTest < ActionDispatch::IntegrationTest
   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
@@ -237,6 +289,38 @@ class OAuthTest < ActionDispatch::IntegrationTest
     assert_response :unauthorized
   end
 
+  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
+    assert_select "p", "You have denied application #{client.name} access to your account."
+    token.reload
+    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
+    assert_select "p", "The authorization token is not valid."
+    token.reload
+    assert_nil token.authorized_at
+    assert_not_nil token.invalidated_at
+  end
+
   def get_request_token(client, options = {})
     signed_get "/oauth/request_token", options.merge(:consumer => client)
     assert_response :success
@@ -245,6 +329,7 @@ class OAuthTest < ActionDispatch::IntegrationTest
     assert_not_nil token.created_at
     assert_nil token.authorized_at
     assert_nil token.invalidated_at
+    assert_equal options[:oauth_callback], token.callback_url
     assert_allowed token, client.permissions
 
     token