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

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

diff --git a/test/controllers/messages_controller_test.rb b/test/controllers/messages_controller_test.rb
index db3a200b644711b40bfd91fbffcb20510c443878..70d1beb18317b362d3dfd137023b406003646ac7 100644 (file)
--- a/test/controllers/messages_controller_test.rb
+++ b/test/controllers/messages_controller_test.rb
@@ -245,7 +245,7 @@ class MessagesControllerTest < ActionDispatch::IntegrationTest
     # 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))
     # 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]
+    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)
 
     # Login as the right user
     session_for(recipient_user)


@@ -263,6 +263,21 @@ class MessagesControllerTest < ActionDispatch::IntegrationTest
     end
     assert Message.find(message.id).message_read
 
     end
     assert Message.find(message.id).message_read
 

+    # Login as the sending user
+    session_for(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='#{recipient_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
+

     # Asking to reply to a message with a bogus ID should fail
     get message_reply_path(99999)
     assert_response :not_found
     # Asking to reply to a message with a bogus ID should fail
     get message_reply_path(99999)
     assert_response :not_found


@@ -287,26 +302,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))
     # 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)
 
 
     # 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
     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)
 
     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
     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
     assert Message.find(message.id).message_read
 
     # Asking to read a message with a bogus ID should fail


@@ -369,10 +386,10 @@ class MessagesControllerTest < ActionDispatch::IntegrationTest
   ##
   # test the mark action
   def test_mark
   ##
   # test the mark action
   def test_mark

-    user = create(:user)
+    sender_user = create(:user)

     recipient_user = create(:user)
     other_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)
 
     # Check that the marking a message requires us to login
     post message_mark_path(message)


@@ -386,6 +403,14 @@ class MessagesControllerTest < ActionDispatch::IntegrationTest
     assert_response :not_found
     assert_template "no_such_message"
 
     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)
 
     # Login as the message recipient_user
     session_for(recipient_user)
 


@@ -415,6 +440,27 @@ class MessagesControllerTest < ActionDispatch::IntegrationTest
     assert_template "no_such_message"
   end
 
     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 muted_messages_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 muted_messages_path
+    assert_not Message.find(message.id).message_read
+  end
+

   ##
   # test the destroy action
   def test_destroy
   ##
   # test the destroy action
   def test_destroy