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

[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 90675685008ff46dfb2481b3a3a579190868a64b..b25986d8476a81e4d03d1a69049952088fd59c43 100644 (file)
--- a/test/controllers/friendships_controller_test.rb
+++ b/test/controllers/friendships_controller_test.rb
@@ -6,19 +6,19 @@ class FriendshipsControllerTest < ActionDispatch::IntegrationTest
   def test_routes
     assert_routing(
       { :path => "/user/username/make_friend", :method => :get },
   def test_routes
     assert_routing(
       { :path => "/user/username/make_friend", :method => :get },

-      { :controller => "users", :action => "make_friend", :display_name => "username" }
+      { :controller => "friendships", :action => "make_friend", :display_name => "username" }

     )
     assert_routing(
       { :path => "/user/username/make_friend", :method => :post },
     )
     assert_routing(
       { :path => "/user/username/make_friend", :method => :post },

-      { :controller => "users", :action => "make_friend", :display_name => "username" }
+      { :controller => "friendships", :action => "make_friend", :display_name => "username" }

     )
     assert_routing(
       { :path => "/user/username/remove_friend", :method => :get },
     )
     assert_routing(
       { :path => "/user/username/remove_friend", :method => :get },

-      { :controller => "users", :action => "remove_friend", :display_name => "username" }
+      { :controller => "friendships", :action => "remove_friend", :display_name => "username" }

     )
     assert_routing(
       { :path => "/user/username/remove_friend", :method => :post },
     )
     assert_routing(
       { :path => "/user/username/remove_friend", :method => :post },

-      { :controller => "users", :action => "remove_friend", :display_name => "username" }
+      { :controller => "friendships", :action => "remove_friend", :display_name => "username" }

     )
   end
 
     )
   end
 


@@ -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 :action => "login", :referer => make_friend_path(:display_name => friend.display_name)
+    assert_redirected_to login_path(:referer => make_friend_path(:display_name => friend.display_name))

 
     # 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)


@@ -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 :action => "login", :referer => remove_friend_path(:display_name => friend.display_name)
+    assert_redirected_to login_path(:referer => remove_friend_path(:display_name => friend.display_name))

 
     # 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 }