X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/dae3dcf87edcfc0648cd0b93b069b0eee67d3ab7..d478f94239ece371d6b14ce5e51adfbf7393073f:/test/integration/user_login_test.rb

diff --git a/test/integration/user_login_test.rb b/test/integration/user_login_test.rb
index c13dbfaab..d027334d0 100644
--- a/test/integration/user_login_test.rb
+++ b/test/integration/user_login_test.rb
@@ -1,7 +1,7 @@
 require "test_helper"
 
 class UserLoginTest < ActionDispatch::IntegrationTest
-  fixtures :users, :user_blocks
+  fixtures :users, :user_roles
 
   def setup
     OmniAuth.config.test_mode = true
@@ -129,6 +129,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
   def test_login_email_password_blocked
     user = users(:blocked_user)
+    create(:user_block, :needs_view, :user => user)
 
     try_password_login user.email, "test"
 
@@ -138,6 +139,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
   def test_login_email_password_blocked_upcase
     user = users(:blocked_user)
+    create(:user_block, :needs_view, :user => user)
 
     try_password_login user.email.upcase, "test"
 
@@ -147,6 +149,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
   def test_login_email_password_blocked_titlecase
     user = users(:blocked_user)
+    create(:user_block, :needs_view, :user => user)
 
     try_password_login user.email.titlecase, "test"
 
@@ -267,6 +270,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
   def test_login_username_password_blocked
     user = users(:blocked_user)
+    create(:user_block, :needs_view, :user => user)
 
     try_password_login user.display_name.upcase, "test"
 
@@ -276,6 +280,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
   def test_login_username_password_blocked_upcase
     user = users(:blocked_user)
+    create(:user_block, :needs_view, :user => user)
 
     try_password_login user.display_name, "test"
 
@@ -285,6 +290,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
 
   def test_login_username_password_blocked_titlecase
     user = users(:blocked_user)
+    create(:user_block, :needs_view, :user => user)
 
     try_password_login user.display_name.titlecase, "test"
 
@@ -549,7 +555,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
     assert_template "changeset/history"
     assert_select "span.username", "openIDuser"
 
-    user = User.find_by_display_name("openIDuser")
+    user = User.find_by(:display_name => "openIDuser")
     assert_equal "google", user.auth_provider
     assert_equal "987654321", user.auth_uid
   end