Merge branch 'master' into openid

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

diff --git a/test/integration/client_application_test.rb b/test/integration/client_application_test.rb
index d4fd68a14d028c43a170db6dca7657ed73778933..80da36deb38edb975e5753dcbf465c24fe9adf3a 100644 (file)
--- a/test/integration/client_application_test.rb
+++ b/test/integration/client_application_test.rb
@@ -7,7 +7,12 @@ class ClientApplicationTest < ActionController::IntegrationTest
   # run through the procedure of creating a client application and checking
   # that it shows up on the user's account page.
   def test_create_application
   # run through the procedure of creating a client application and checking
   # that it shows up on the user's account page.
   def test_create_application

-    post '/login', {'user[email]' => "test@example.com", 'user[password]' => "test", :referer => '/user/test2'}
+    get '/login'
+    assert_response :redirect
+    assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true"
+    follow_redirect!
+    assert_response :success
+    post '/login', {'username' => "test@example.com", 'password' => "test", :referer => '/user/test2'}

     assert_response :redirect
     follow_redirect!
     assert_response :success
     assert_response :redirect
     follow_redirect!
     assert_response :success