X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/7f3cb3c6246e6e271761e714cceb081e85a4d245..refs/heads/master:/test/controllers/messages_controller_test.rb diff --git a/test/controllers/messages_controller_test.rb b/test/controllers/messages_controller_test.rb index db3a200b6..b2bb71b1c 100644 --- a/test/controllers/messages_controller_test.rb +++ b/test/controllers/messages_controller_test.rb @@ -5,15 +5,7 @@ class MessagesControllerTest < ActionDispatch::IntegrationTest # test all routes which lead to this controller def test_routes assert_routing( - { :path => "/messages/inbox", :method => :get }, - { :controller => "messages", :action => "inbox" } - ) - assert_routing( - { :path => "/messages/outbox", :method => :get }, - { :controller => "messages", :action => "outbox" } - ) - assert_routing( - { :path => "/message/new/username", :method => :get }, + { :path => "/messages/new/username", :method => :get }, { :controller => "messages", :action => "new", :display_name => "username" } ) assert_routing( @@ -28,14 +20,6 @@ class MessagesControllerTest < ActionDispatch::IntegrationTest { :path => "/messages/1/mark", :method => :post }, { :controller => "messages", :action => "mark", :message_id => "1" } ) - assert_routing( - { :path => "/messages/1/reply", :method => :get }, - { :controller => "messages", :action => "reply", :message_id => "1" } - ) - assert_routing( - { :path => "/messages/1/reply", :method => :post }, - { :controller => "messages", :action => "reply", :message_id => "1" } - ) assert_routing( { :path => "/messages/1", :method => :delete }, { :controller => "messages", :action => "destroy", :id => "1" } @@ -179,7 +163,7 @@ class MessagesControllerTest < ActionDispatch::IntegrationTest end end end - assert_redirected_to inbox_messages_path + assert_redirected_to messages_outbox_path assert_equal "Message sent", flash[:notice] e = ActionMailer::Base.deliveries.first assert_equal [recipient_user.email], e.to @@ -227,48 +211,6 @@ class MessagesControllerTest < ActionDispatch::IntegrationTest end end - ## - # test the reply action - def test_reply - user = create(:user) - recipient_user = create(:user) - other_user = create(:user) - message = create(:message, :unread, :sender => user, :recipient => recipient_user) - - # Check that the message reply page requires us to login - 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) - 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) - assert_response :success - assert_template "new" - assert_select "title", "Re: #{message.title} | OpenStreetMap" - assert_select "form[action='/messages']", :count => 1 do - assert_select "input[type='hidden'][name='display_name'][value='#{user.display_name}']" - assert_select "input#message_title[value='Re: #{message.title}']", :count => 1 - assert_select "textarea#message_body", :count => 1 - assert_select "input[type='submit'][value='Send']", :count => 1 - end - assert Message.find(message.id).message_read - - # Asking to reply to a message with a bogus ID should fail - get message_reply_path(99999) - assert_response :not_found - assert_template "no_such_message" - end - ## # test the show action def test_show @@ -287,26 +229,28 @@ class MessagesControllerTest < ActionDispatch::IntegrationTest # Check that we can't read the message 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] + 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 + # Check that the message sender can read the message and that Reply button is available get message_path(message) assert_response :success assert_template "show" assert_select "a[href='#{user_path recipient_user}']", :text => recipient_user.display_name + assert_select "a.btn.btn-primary", :text => "Reply" assert_not Message.find(message.id).message_read # Login as the message recipient session_for(recipient_user) - # Check that the message recipient can read the message + # Check that the message recipient can read the message and that Reply button is available get message_path(message) assert_response :success assert_template "show" assert_select "a[href='#{user_path user}']", :text => user.display_name + assert_select "a.btn.btn-primary", :text => "Reply" assert Message.find(message.id).message_read # Asking to read a message with a bogus ID should fail @@ -315,64 +259,13 @@ class MessagesControllerTest < ActionDispatch::IntegrationTest assert_template "no_such_message" end - ## - # test the inbox action - def test_inbox - user = create(:user) - read_message = create(:message, :read, :recipient => user) - # Check that the inbox page requires us to login - get inbox_messages_path - assert_redirected_to login_path(:referer => inbox_messages_path) - - # Login - session_for(user) - - # Check that we can view our inbox when logged in - get inbox_messages_path - assert_response :success - assert_template "inbox" - assert_select ".content-inner > table.messages-table > tbody", :count => 1 do - assert_select "tr", :count => 1 - assert_select "tr#inbox-#{read_message.id}", :count => 1 do - assert_select "a[href='#{user_path read_message.sender}']", :text => read_message.sender.display_name - assert_select "a[href='#{message_path read_message}']", :text => read_message.title - end - end - end - - ## - # test the outbox action - def test_outbox - user = create(:user) - message = create(:message, :sender => user) - - # Check that the outbox page requires us to login - get outbox_messages_path - assert_redirected_to login_path(:referer => outbox_messages_path) - - # Login - session_for(user) - - # Check that we can view our outbox when logged in - get outbox_messages_path - assert_response :success - assert_template "outbox" - assert_select ".content-inner > table.messages-table > tbody", :count => 1 do - assert_select "tr", :count => 1 - assert_select "tr#outbox-#{message.id}", :count => 1 do - assert_select "a[href='#{user_path message.recipient}']", :text => message.recipient.display_name - assert_select "a[href='#{message_path message}']", :text => message.title - end - end - end - ## # test the mark action def test_mark - user = create(:user) + sender_user = create(:user) recipient_user = create(:user) other_user = create(:user) - message = create(:message, :unread, :sender => user, :recipient => recipient_user) + message = create(:message, :unread, :sender => sender_user, :recipient => recipient_user) # Check that the marking a message requires us to login post message_mark_path(message) @@ -386,27 +279,35 @@ class MessagesControllerTest < ActionDispatch::IntegrationTest assert_response :not_found assert_template "no_such_message" + # Login as the message sender_user + session_for(sender_user) + + # Check that marking a message we sent fails + post message_mark_path(message) + assert_response :not_found + assert_template "no_such_message" + # Login as the message recipient_user session_for(recipient_user) # Check that the marking a message read works post message_mark_path(message, :mark => "read") - assert_redirected_to inbox_messages_path + assert_redirected_to messages_inbox_path assert Message.find(message.id).message_read # Check that the marking a message unread works post message_mark_path(message, :mark => "unread") - assert_redirected_to inbox_messages_path + assert_redirected_to messages_inbox_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, :mark => "read"), :headers => { :referer => message_path(message) } - assert_redirected_to inbox_messages_path + assert_redirected_to messages_inbox_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, :mark => "unread"), :headers => { :referer => message_path(message) } - assert_redirected_to inbox_messages_path + assert_redirected_to messages_inbox_path assert_not Message.find(message.id).message_read # Asking to mark a message with a bogus ID should fail @@ -415,6 +316,27 @@ class MessagesControllerTest < ActionDispatch::IntegrationTest assert_template "no_such_message" end + ## + # test the mark action for messages from muted users + def test_mark_muted + sender_user = create(:user) + recipient_user = create(:user) + create(:user_mute, :owner => recipient_user, :subject => sender_user) + message = create(:message, :unread, :sender => sender_user, :recipient => recipient_user) + + session_for(recipient_user) + + # Check that the marking a message read works + post message_mark_path(message, :mark => "read") + assert_redirected_to messages_muted_inbox_path + assert Message.find(message.id).message_read + + # Check that the marking a message unread works + post message_mark_path(message, :mark => "unread") + assert_redirected_to messages_muted_inbox_path + assert_not Message.find(message.id).message_read + end + ## # test the destroy action def test_destroy @@ -441,15 +363,15 @@ class MessagesControllerTest < ActionDispatch::IntegrationTest # Check that the destroy a received message works delete message_path(read_message) - assert_redirected_to inbox_messages_path + assert_redirected_to messages_inbox_path assert_equal "Message deleted", flash[:notice] m = Message.find(read_message.id) assert m.from_user_visible assert_not m.to_user_visible # Check that the destroying a sent message works - delete message_path(sent_message, :referer => outbox_messages_path) - assert_redirected_to outbox_messages_path + delete message_path(sent_message, :referer => messages_outbox_path) + assert_redirected_to messages_outbox_path assert_equal "Message deleted", flash[:notice] m = Message.find(sent_message.id) assert_not m.from_user_visible