cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move make_friend and remove_friend to friendships controller

Browse source
This commit is contained in:
Andy Allan 2020-06-03 18:23:07 +02:00
parent 59c90aa023
commit 8ebfdbc1ff
9 changed files with 88 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

12
test/controllers/friendships_controller_test.rb
View file

@ -6,19 +6,19 @@ class FriendshipsControllerTest < ActionDispatch::IntegrationTest
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 },
{ :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 },
{ :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 },
{ :controller => "users", :action => "remove_friend", :display_name => "username" }
{ :controller => "friendships", :action => "remove_friend", :display_name => "username" }
)
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)
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)
@ -129,7 +129,7 @@ class FriendshipsControllerTest < ActionDispatch::IntegrationTest
# 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 }