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 b52f55ea53124239908a93acdd376e8a728394c3..32314703021ccafac736f9e0f60d0f1e0842247e 100644 (file)
--- a/test/integration/oauth_test.rb
+++ b/test/integration/oauth_test.rb
@@ -53,6 +53,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


@@ -100,6 +104,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 +116,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 +136,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


@@ -162,6 +182,10 @@ 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
     post "/oauth/authorize",
          :oauth_token => token.token,
          :allow_read_prefs => true, :allow_write_prefs => true


@@ -217,6 +241,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


@@ -264,6 +292,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 +304,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 +329,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 options[:oauth_callback], token.callback_url

     assert_allowed token, client.permissions
 
     token
     assert_allowed token, client.permissions
 
     token