Merge remote-tracking branch 'openstreetmap/pull/1337'

[rails.git] / test / controllers / user_controller_test.rb

diff --git a/test/controllers/user_controller_test.rb b/test/controllers/user_controller_test.rb
index 6a5fca78563af0077ae27c80c2dceb33032dbcbf..14bea63740707babb7a4246179af0ff897d7ebf4 100644 (file)
--- a/test/controllers/user_controller_test.rb
+++ b/test/controllers/user_controller_test.rb
@@ -924,6 +924,7 @@ class UserControllerTest < ActionController::TestCase
     end
 
     # Test a user who has been blocked
     end
 
     # Test a user who has been blocked

+    create(:user_block, :user => users(:blocked_user))

     get :view, :display_name => "blocked"
     assert_response :success
     assert_select "div#userinformation" do
     get :view, :display_name => "blocked"
     assert_response :success
     assert_select "div#userinformation" do


@@ -938,6 +939,7 @@ class UserControllerTest < ActionController::TestCase
     end
 
     # Test a moderator who has applied blocks
     end
 
     # Test a moderator who has applied blocks

+    create(:user_block, :creator => users(:moderator_user))

     get :view, :display_name => "moderator"
     assert_response :success
     assert_select "div#userinformation" do
     get :view, :display_name => "moderator"
     assert_response :success
     assert_select "div#userinformation" do


@@ -1191,7 +1193,7 @@ class UserControllerTest < ActionController::TestCase
     # Get users to work with
     user = users(:normal_user)
     friend = users(:public_user)
     # Get users to work with
     user = users(:normal_user)
     friend = users(:public_user)

-    create(:friend, :user_id => user.id, :friend_user_id => friend.id)
+    create(:friend, :befriender => user, :befriendee => friend)

 
     # Check that the users are friends
     assert Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
 
     # Check that the users are friends
     assert Friend.where(:user_id => user.id, :friend_user_id => friend.id).first