Merge branch 'master' into openstreetbugs

[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 b4ca49022ec056c8b6fbccb6b283e5a4082b3640..7003d769251c2a97dbe0578a35bf627e60255c41 100644 (file)
--- a/test/integration/user_blocks_test.rb
+++ b/test/integration/user_blocks_test.rb
@@ -39,7 +39,7 @@ class UserBlocksTest < ActionController::IntegrationTest
     # revoke the ban
     get '/login'
     assert_response :success
-    post '/login', {'user[email]' => moderator.email, 'user[password]' => "test", :referer => "/blocks/#{block.id}/revoke"}
+    post '/login', {'username' => moderator.email, 'password' => "test", :referer => "/blocks/#{block.id}/revoke"}
     assert_response :redirect
     follow_redirect!
     assert_response :success