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 942a94302de8ec4195f2afdb46a0545aa3573af6..7003d769251c2a97dbe0578a35bf627e60255c41 100644 (file)
--- a/test/integration/user_blocks_test.rb
+++ b/test/integration/user_blocks_test.rb
@@ -38,9 +38,6 @@ class UserBlocksTest < ActionController::IntegrationTest
 
     # revoke the ban
     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