Merge branch 'master' into openstreetbugs

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

diff --git a/test/integration/user_roles_test.rb b/test/integration/user_roles_test.rb
index df8b1561f0083d5aa26dc9a32685b0d43eb146a0..8bf06374fc41601ed914b0197d2d51712cc26dd4 100644 (file)
--- a/test/integration/user_roles_test.rb
+++ b/test/integration/user_roles_test.rb
@@ -17,7 +17,12 @@ class UserRolesControllerTest < ActionController::IntegrationTest
   end
 
   def check_fail(action, user, role)
-    post '/login', {'user[email]' => users(user).email, 'user[password]' => "test", :referer => "/"}
+    get '/login'
+    assert_response :redirect
+    assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true"
+    follow_redirect!
+    assert_response :success
+    post '/login', {'username' => users(user).email, 'password' => "test", :referer => "/"}
     assert_response :redirect
     follow_redirect!
     assert_response :success
@@ -30,7 +35,12 @@ class UserRolesControllerTest < ActionController::IntegrationTest
   end
 
   def check_success(action, user, role)
-    post '/login', {'user[email]' => users(user).email, 'user[password]' => "test", :referer => "/"}
+    get '/login'
+    assert_response :redirect
+    assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true"
+    follow_redirect!
+    assert_response :success
+    post '/login', {'username' => users(user).email, 'password' => "test", :referer => "/"}
     assert_response :redirect
     follow_redirect!
     assert_response :success