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

[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 4a48ebbbe291e37e657b1288878ced15382f925f..69b0107a854641a8c4129c4c54271eb2834d92d1 100644 (file)
--- a/test/controllers/messages_controller_test.rb
+++ b/test/controllers/messages_controller_test.rb
@@ -263,10 +263,6 @@ class MessagesControllerTest < ActionDispatch::IntegrationTest
     end
     assert Message.find(message.id).message_read
 
-    # Asking to reply to a message with no ID should fail
-    get message_reply_path
-    assert_response :success
-
     # Asking to reply to a message with a bogus ID should fail
     get message_reply_path(:message_id => 99999)
     assert_response :not_found
@@ -313,10 +309,6 @@ class MessagesControllerTest < ActionDispatch::IntegrationTest
     assert_select "a[href='#{user_path user}']", :text => user.display_name
     assert Message.find(message.id).message_read
 
-    # Asking to read a message with no ID should fail
-    get message_path
-    assert_response :success
-
     # Asking to read a message with a bogus ID should fail
     get message_path(:id => 99999)
     assert_response :not_found
@@ -417,10 +409,6 @@ class MessagesControllerTest < ActionDispatch::IntegrationTest
     assert_redirected_to inbox_messages_path
     assert_not Message.find(message.id).message_read
 
-    # Asking to mark a message with no ID should fail
-    post message_mark_path
-    assert_redirected_to inbox_messages_path
-
     # Asking to mark a message with a bogus ID should fail
     post message_mark_path(:message_id => 99999)
     assert_response :not_found
@@ -467,10 +455,6 @@ class MessagesControllerTest < ActionDispatch::IntegrationTest
     assert_not m.from_user_visible
     assert m.to_user_visible
 
-    # Asking to destroy a message with no ID should fail
-    delete message_path
-    assert_redirected_to inbox_messages_path
-
     # Asking to destroy a message with a bogus ID should fail
     delete message_path(:id => 99999)
     assert_response :not_found