Merge remote-tracking branch 'upstream/pull/4843'

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

diff --git a/test/integration/oauth_test.rb b/test/integration/oauth_test.rb
index 70f161fc9e2a9fb7cacf810ae733789dbcffd36e..dfe2552bb04d45b3521688ea18069f19fe56586a 100644 (file)
--- a/test/integration/oauth_test.rb
+++ b/test/integration/oauth_test.rb
@@ -58,7 +58,6 @@ class OAuthTest < ActionDispatch::IntegrationTest
          :params => { :oauth_token => token.token,
                       :allow_read_prefs => "1", :allow_write_prefs => "1" }
     if client.callback_url
          :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_redirected_to "#{client.callback_url}?oauth_token=#{token.token}"
     else
       assert_response :success


@@ -156,7 +155,6 @@ class OAuthTest < ActionDispatch::IntegrationTest
     post "/oauth/authorize",
          :params => { :oauth_token => token.token, :oauth_callback => callback_url,
                       :allow_write_api => "1", :allow_read_gpx => "1" }
     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_redirected_to "#{callback_url}?oauth_token=#{token.token}"
     token.reload
     assert_not_nil token.created_at