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

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

diff --git a/test/controllers/friendships_controller_test.rb b/test/controllers/friendships_controller_test.rb
index 19de4ae8e6784ad8c4dba37ac5ac242ecb4a8869..f63a8e44982318701c6c486ecda0d283798543da 100644 (file)
--- a/test/controllers/friendships_controller_test.rb
+++ b/test/controllers/friendships_controller_test.rb
@@ -32,7 +32,7 @@ class FriendshipsControllerTest < ActionDispatch::IntegrationTest
 
     # When not logged in a GET should ask us to login
     get make_friend_path(friend)
 
     # When not logged in a GET should ask us to login
     get make_friend_path(friend)

-    assert_redirected_to login_path(:referer => make_friend_path(:display_name => friend.display_name))
+    assert_redirected_to login_path(:referer => make_friend_path(friend))

 
     # When not logged in a POST should error
     post make_friend_path(friend)
 
     # When not logged in a POST should error
     post make_friend_path(friend)


@@ -113,7 +113,7 @@ class FriendshipsControllerTest < ActionDispatch::IntegrationTest
   def test_make_friend_unknown_user
     # Should error when a bogus user is specified
     session_for(create(:user))
   def test_make_friend_unknown_user
     # Should error when a bogus user is specified
     session_for(create(:user))

-    get make_friend_path(:display_name => "No Such User")
+    get make_friend_path("No Such User")

     assert_response :not_found
     assert_template :no_such_user
   end
     assert_response :not_found
     assert_template :no_such_user
   end


@@ -129,7 +129,7 @@ class FriendshipsControllerTest < ActionDispatch::IntegrationTest
 
     # When not logged in a GET should ask us to login
     get remove_friend_path(friend)
 
     # When not logged in a GET should ask us to login
     get remove_friend_path(friend)

-    assert_redirected_to login_path(:referer => remove_friend_path(:display_name => friend.display_name))
+    assert_redirected_to login_path(:referer => remove_friend_path(friend))

 
     # When not logged in a POST should error
     post remove_friend_path, :params => { :display_name => friend.display_name }
 
     # When not logged in a POST should error
     post remove_friend_path, :params => { :display_name => friend.display_name }


@@ -191,7 +191,7 @@ class FriendshipsControllerTest < ActionDispatch::IntegrationTest
   def test_remove_friend_unknown_user
     # Should error when a bogus user is specified
     session_for(create(:user))
   def test_remove_friend_unknown_user
     # Should error when a bogus user is specified
     session_for(create(:user))

-    get remove_friend_path(:display_name => "No Such User")
+    get remove_friend_path("No Such User")

     assert_response :not_found
     assert_template :no_such_user
   end
     assert_response :not_found
     assert_template :no_such_user
   end