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

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

Browse source
This commit is contained in:
Tom Hughes 2024-05-06 11:15:12 +01:00
commit 0b18937384
1 changed files with 25 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

50
test/controllers/messages_controller_test.rb
View file

@ -236,22 +236,22 @@ class MessagesControllerTest < ActionDispatch::IntegrationTest
message = create(:message, :unread, :sender => user, :recipient => recipient_user)
# Check that the message reply page requires us to login
get message_reply_path(:message_id => message)
assert_redirected_to login_path(:referer => message_reply_path(:message_id => message.id))
get message_reply_path(message)
assert_redirected_to login_path(:referer => message_reply_path(message))
# Login as the wrong user
session_for(other_user)
# Check that we can't reply to somebody else's message
get message_reply_path(:message_id => message)
assert_redirected_to login_path(:referer => message_reply_path(:message_id => message.id))
get message_reply_path(message)
assert_redirected_to login_path(:referer => message_reply_path(message))
assert_equal "You are logged in as `#{other_user.display_name}' but the message you have asked to reply to was not sent to that user. Please log in as the correct user in order to reply.", flash[:notice]
# Login as the right user
session_for(recipient_user)
# Check that the message reply page loads
get message_reply_path(:message_id => message)
get message_reply_path(message)
assert_response :success
assert_template "new"
assert_select "title", "Re: #{message.title} | OpenStreetMap"
@ -264,7 +264,7 @@ class MessagesControllerTest < ActionDispatch::IntegrationTest
assert Message.find(message.id).message_read
# Asking to reply to a message with a bogus ID should fail
get message_reply_path(:message_id => 99999)
get message_reply_path(99999)
assert_response :not_found
assert_template "no_such_message"
end
@ -278,22 +278,22 @@ class MessagesControllerTest < ActionDispatch::IntegrationTest
message = create(:message, :unread, :sender => user, :recipient => recipient_user)
# Check that the show message page requires us to login
get message_path(:id => message)
assert_redirected_to login_path(:referer => message_path(:id => message.id))
get message_path(message)
assert_redirected_to login_path(:referer => message_path(message))
# Login as the wrong user
session_for(other_user)
# Check that we can't read the message
get message_path(:id => message)
assert_redirected_to login_path(:referer => message_path(:id => message.id))
get message_path(message)
assert_redirected_to login_path(:referer => message_path(message))
assert_equal "You are logged in as `#{other_user.display_name}' but the message you have asked to read was not sent by or to that user. Please log in as the correct user in order to read it.", flash[:notice]
# Login as the message sender
session_for(user)
# Check that the message sender can read the message
get message_path(:id => message)
get message_path(message)
assert_response :success
assert_template "show"
assert_select "a[href='#{user_path recipient_user}']", :text => recipient_user.display_name
@ -303,14 +303,14 @@ class MessagesControllerTest < ActionDispatch::IntegrationTest
session_for(recipient_user)
# Check that the message recipient can read the message
get message_path(:id => message)
get message_path(message)
assert_response :success
assert_template "show"
assert_select "a[href='#{user_path user}']", :text => user.display_name
assert Message.find(message.id).message_read
# Asking to read a message with a bogus ID should fail
get message_path(:id => 99999)
get message_path(99999)
assert_response :not_found
assert_template "no_such_message"
end
@ -375,14 +375,14 @@ class MessagesControllerTest < ActionDispatch::IntegrationTest
message = create(:message, :unread, :sender => user, :recipient => recipient_user)
# Check that the marking a message requires us to login
post message_mark_path(:message_id => message)
post message_mark_path(message)
assert_response :forbidden
# Login as a user with no messages
session_for(other_user)
# Check that marking a message we didn't send or receive fails
post message_mark_path(:message_id => message)
post message_mark_path(message)
assert_response :not_found
assert_template "no_such_message"
@ -390,27 +390,27 @@ class MessagesControllerTest < ActionDispatch::IntegrationTest
session_for(recipient_user)
# Check that the marking a message read works
post message_mark_path(:message_id => message, :mark => "read")
post message_mark_path(message, :mark => "read")
assert_redirected_to inbox_messages_path
assert Message.find(message.id).message_read
# Check that the marking a message unread works
post message_mark_path(:message_id => message, :mark => "unread")
post message_mark_path(message, :mark => "unread")
assert_redirected_to inbox_messages_path
assert_not Message.find(message.id).message_read
# Check that the marking a message read works and redirects to inbox from the message page
post message_mark_path(:message_id => message, :mark => "read"), :headers => { :referer => message_path(message) }
post message_mark_path(message, :mark => "read"), :headers => { :referer => message_path(message) }
assert_redirected_to inbox_messages_path
assert Message.find(message.id).message_read
# Check that the marking a message unread works and redirects to inbox from the message page
post message_mark_path(:message_id => message, :mark => "unread"), :headers => { :referer => message_path(message) }
post message_mark_path(message, :mark => "unread"), :headers => { :referer => message_path(message) }
assert_redirected_to inbox_messages_path
assert_not Message.find(message.id).message_read
# Asking to mark a message with a bogus ID should fail
post message_mark_path(:message_id => 99999)
post message_mark_path(99999)
assert_response :not_found
assert_template "no_such_message"
end
@ -425,14 +425,14 @@ class MessagesControllerTest < ActionDispatch::IntegrationTest
sent_message = create(:message, :unread, :recipient => second_user, :sender => user)
# Check that destroying a message requires us to login
delete message_path(:id => read_message)
delete message_path(read_message)
assert_response :forbidden
# Login as a user with no messages
session_for(other_user)
# Check that destroying a message we didn't send or receive fails
delete message_path(:id => read_message)
delete message_path(read_message)
assert_response :not_found
assert_template "no_such_message"
@ -440,7 +440,7 @@ class MessagesControllerTest < ActionDispatch::IntegrationTest
session_for(user)
# Check that the destroy a received message works
delete message_path(:id => read_message)
delete message_path(read_message)
assert_redirected_to inbox_messages_path
assert_equal "Message deleted", flash[:notice]
m = Message.find(read_message.id)
@ -448,7 +448,7 @@ class MessagesControllerTest < ActionDispatch::IntegrationTest
assert_not m.to_user_visible
# Check that the destroying a sent message works
delete message_path(:id => sent_message, :referer => outbox_messages_path)
delete message_path(sent_message, :referer => outbox_messages_path)
assert_redirected_to outbox_messages_path
assert_equal "Message deleted", flash[:notice]
m = Message.find(sent_message.id)
@ -456,7 +456,7 @@ class MessagesControllerTest < ActionDispatch::IntegrationTest
assert m.to_user_visible
# Asking to destroy a message with a bogus ID should fail
delete message_path(:id => 99999)
delete message_path(99999)
assert_response :not_found
assert_template "no_such_message"
end