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

diff --combined test/controllers/user_controller_test.rb
index c3a1116054edd014a31e37a4febc84d1ad9b1633,8c88615a7cd94bc331d3b986fde2e0f796eb72aa..14bea63740707babb7a4246179af0ff897d7ebf4
--- 1/test/controllers/user_controller_test.rb
--- 2/test/controllers/user_controller_test.rb
+++ b/test/controllers/user_controller_test.rb
@@@ -924,7 -924,6 +924,7 @@@ class UserControllerTest < ActionContro
      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
@@@ -939,7 -938,6 +939,7 @@@
      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
@@@ -1193,7 -1191,7 +1193,7 @@@
      # 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