Merge branch 'master' into openid

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

diff --git a/test/integration/user_blocks_test.rb b/test/integration/user_blocks_test.rb
index f0b9070d6d2a0d3c50eb09dd2283cfc7cc7733ff..942a94302de8ec4195f2afdb46a0545aa3573af6 100644 (file)
--- a/test/integration/user_blocks_test.rb
+++ b/test/integration/user_blocks_test.rb
@@ -37,7 +37,12 @@ class UserBlocksTest < ActionController::IntegrationTest
     assert_response :forbidden
 
     # revoke the ban
-    post '/login', {'user[email]' => moderator.email, 'user[password]' => "test", :referer => "/blocks/#{block.id}/revoke"}
+    get '/login'
+    assert_response :redirect
+    assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true"
+    follow_redirect!
+    assert_response :success
+    post '/login', {'username' => moderator.email, 'password' => "test", :referer => "/blocks/#{block.id}/revoke"}
     assert_response :redirect
     follow_redirect!
     assert_response :success