Merge remote-tracking branch 'upstream/pull/1987'

diff --cc test/controllers/diary_entry_controller_test.rb
Simple merge

diff --cc test/controllers/traces_controller_test.rb
Simple merge

diff --cc test/controllers/user_controller_test.rb
index f2aaffb9b1d3da9e0fcd32f31ad19a37b56ec608,48e8b4119b8a7c6427a556d952c153b56bdcd907..42bc1ac3f7492f1efafd7ed02f68fe2b32abddb6
--- 1/test/controllers/user_controller_test.rb
--- 2/test/controllers/user_controller_test.rb
+++ b/test/controllers/user_controller_test.rb
@@@ -1250,8 -1250,8 +1250,8 @@@ class UserControllerTest < ActionContro
      assert_difference "ActionMailer::Base.deliveries.size", 1 do
        post :make_friend, :params => { :display_name => friend.display_name }, :session => { :user => user }
      end
 -    assert_redirected_to user_path(:display_name => friend.display_name)
 +    assert_redirected_to user_path(friend)
-     assert_match /is now your friend/, flash[:notice]
+     assert_match(/is now your friend/, flash[:notice])
      assert Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
      email = ActionMailer::Base.deliveries.first
      assert_equal 1, email.to.count
@@@ -1262,8 -1262,8 +1262,8 @@@
      assert_no_difference "ActionMailer::Base.deliveries.size" do
        post :make_friend, :params => { :display_name => friend.display_name }, :session => { :user => user }
      end
 -    assert_redirected_to user_path(:display_name => friend.display_name)
 +    assert_redirected_to user_path(friend)
-     assert_match /You are already friends with/, flash[:warning]
+     assert_match(/You are already friends with/, flash[:warning])
      assert Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
    end
  
@@@ -1335,14 -1335,14 +1335,14 @@@
  
      # When logged in a POST should remove the friendship
      post :remove_friend, :params => { :display_name => friend.display_name }, :session => { :user => user }
 -    assert_redirected_to user_path(:display_name => friend.display_name)
 +    assert_redirected_to user_path(friend)
-     assert_match /was removed from your friends/, flash[:notice]
+     assert_match(/was removed from your friends/, flash[:notice])
      assert_nil Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
  
      # A second POST should report that the friendship does not exist
      post :remove_friend, :params => { :display_name => friend.display_name }, :session => { :user => user }
 -    assert_redirected_to user_path(:display_name => friend.display_name)
 +    assert_redirected_to user_path(friend)
-     assert_match /is not one of your friends/, flash[:error]
+     assert_match(/is not one of your friends/, flash[:error])
      assert_nil Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
    end