X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/eaad3611b8560966b8126abbae3828a15d768533..25b93471c1861b77190f15dac17b526619710858:/test/functional/message_controller_test.rb diff --git a/test/functional/message_controller_test.rb b/test/functional/message_controller_test.rb index d673a8126..66ca8bc70 100644 --- a/test/functional/message_controller_test.rb +++ b/test/functional/message_controller_test.rb @@ -53,7 +53,6 @@ class MessageControllerTest < ActionController::TestCase # Login as a normal user session[:user] = users(:normal_user).id - cookies["_osm_username"] = users(:normal_user).display_name # Check that the new message page loads get :new, :display_name => users(:public_user).display_name @@ -66,6 +65,44 @@ class MessageControllerTest < ActionController::TestCase assert_select "input[type='submit'][value='Send']", :count => 1 end + # Check that the subject is preserved over errors + assert_difference "ActionMailer::Base.deliveries.size", 0 do + assert_difference "Message.count", 0 do + post :new, + :display_name => users(:public_user).display_name, + :message => { :title => "Test Message", :body => "" } + end + end + assert_response :success + assert_template "new" + assert_select "title", "OpenStreetMap | Send message" + assert_select "form[action='#{new_message_path(:display_name => users(:public_user).display_name)}']", :count => 1 do + assert_select "input#message_title", :count => 1 do + assert_select "[value=Test Message]" + end + assert_select "textarea#message_body", :text => "", :count => 1 + assert_select "input[type='submit'][value='Send']", :count => 1 + end + + # Check that the body text is preserved over errors + assert_difference "ActionMailer::Base.deliveries.size", 0 do + assert_difference "Message.count", 0 do + post :new, + :display_name => users(:public_user).display_name, + :message => { :title => "", :body => "Test message body" } + end + end + assert_response :success + assert_template "new" + assert_select "title", "OpenStreetMap | Send message" + assert_select "form[action='#{new_message_path(:display_name => users(:public_user).display_name)}']", :count => 1 do + assert_select "input#message_title", :count => 1 do + assert_select "[value=]" + end + assert_select "textarea#message_body", :text => "Test message body", :count => 1 + assert_select "input[type='submit'][value='Send']", :count => 1 + end + # Check that sending a message works assert_difference "ActionMailer::Base.deliveries.size", 1 do assert_difference "Message.count", 1 do @@ -85,59 +122,52 @@ class MessageControllerTest < ActionController::TestCase m = Message.find(3) assert_equal users(:normal_user).id, m.from_user_id assert_equal users(:public_user).id, m.to_user_id - assert_in_delta Time.now, m.sent_on, 1 + assert_in_delta Time.now, m.sent_on, 2 assert_equal "Test Message", m.title assert_equal "Test message body", m.body assert_equal "markdown", m.body_format - # Asking to send a message with no user name should fail - get :new - assert_response :not_found - assert_template "user/no_such_user" - assert_select "h2", "The user does not exist" - # Asking to send a message with a bogus user name should fail get :new, :display_name => "non_existent_user" assert_response :not_found assert_template "user/no_such_user" - assert_select "h2", "The user non_existent_user does not exist" + assert_select "h1", "The user non_existent_user does not exist" end ## # test the reply action def test_reply # Check that the message reply page requires us to login - get :reply, :message_id => messages(:read_message).id - assert_redirected_to login_path(:referer => reply_message_path(:message_id => messages(:read_message).id)) + get :reply, :message_id => messages(:unread_message).id + assert_redirected_to login_path(:referer => reply_message_path(:message_id => messages(:unread_message).id)) # Login as the wrong user session[:user] = users(:second_public_user).id - cookies["_osm_username"] = users(:second_public_user).display_name # Check that we can't reply to somebody else's message - get :reply, :message_id => messages(:read_message).id - assert_redirected_to login_path(:referer => reply_message_path(:message_id => messages(:read_message).id)) + get :reply, :message_id => messages(:unread_message).id + assert_redirected_to login_path(:referer => reply_message_path(:message_id => messages(:unread_message).id)) assert_equal "You are logged in as `pulibc_test2' but the message you have asked to reply to was not sent to that user. Please login as the correct user in order to reply.", flash[:notice] # Login as the right user - session[:user] = users(:normal_user).id - cookies["_osm_username"] = users(:normal_user).display_name + session[:user] = users(:public_user).id # Check that the message reply page loads - get :reply, :message_id => messages(:read_message).id + get :reply, :message_id => messages(:unread_message).id assert_response :success assert_template "new" - assert_select "title", "OpenStreetMap | Re: test message 2" - assert_select "form[action='#{new_message_path(:display_name => users(:public_user).display_name)}']", :count => 1 do - assert_select "input#message_title[value='Re: test message 2']", :count => 1 + assert_select "title", "OpenStreetMap | Re: test message 1" + assert_select "form[action='#{new_message_path(:display_name => users(:normal_user).display_name)}']", :count => 1 do + assert_select "input#message_title[value='Re: test message 1']", :count => 1 assert_select "textarea#message_body", :count => 1 assert_select "input[type='submit'][value='Send']", :count => 1 end + assert_equal true, Message.find(messages(:unread_message).id).message_read # Asking to reply to a message with no ID should fail - get :reply - assert_response :not_found - assert_template "no_such_message" + assert_raise ActionController::UrlGenerationError do + get :reply + end # Asking to reply to a message with a bogus ID should fail get :reply, :message_id => 99999 @@ -154,7 +184,6 @@ class MessageControllerTest < ActionController::TestCase # Login as the wrong user session[:user] = users(:second_public_user).id - cookies["_osm_username"] = users(:second_public_user).display_name # Check that we can't read the message get :read, :message_id => messages(:unread_message).id @@ -163,7 +192,6 @@ class MessageControllerTest < ActionController::TestCase # Login as the message sender session[:user] = users(:normal_user).id - cookies["_osm_username"] = users(:normal_user).display_name # Check that the message sender can read the message get :read, :message_id => messages(:unread_message).id @@ -173,7 +201,6 @@ class MessageControllerTest < ActionController::TestCase # Login as the message recipient session[:user] = users(:public_user).id - cookies["_osm_username"] = users(:public_user).display_name # Check that the message recipient can read the message get :read, :message_id => messages(:unread_message).id @@ -182,9 +209,9 @@ class MessageControllerTest < ActionController::TestCase assert_equal true, Message.find(messages(:unread_message).id).message_read # Asking to read a message with no ID should fail - get :read - assert_response :not_found - assert_template "no_such_message" + assert_raise ActionController::UrlGenerationError do + get :read + end # Asking to read a message with a bogus ID should fail get :read, :message_id => 99999 @@ -201,7 +228,6 @@ class MessageControllerTest < ActionController::TestCase # Login session[:user] = users(:normal_user).id - cookies["_osm_username"] = users(:normal_user).display_name # Check that we can view our inbox when logged in get :inbox, :display_name => users(:normal_user).display_name @@ -226,7 +252,6 @@ class MessageControllerTest < ActionController::TestCase # Login session[:user] = users(:normal_user).id - cookies["_osm_username"] = users(:normal_user).display_name # Check that we can view our outbox when logged in get :outbox, :display_name => users(:normal_user).display_name @@ -251,7 +276,6 @@ class MessageControllerTest < ActionController::TestCase # Login as a user with no messages session[:user] = users(:second_public_user).id - cookies["_osm_username"] = users(:second_public_user).display_name # Check that marking a message we didn't send or receive fails post :mark, :message_id => messages(:read_message).id @@ -260,7 +284,6 @@ class MessageControllerTest < ActionController::TestCase # Login as the message recipient session[:user] = users(:public_user).id - cookies["_osm_username"] = users(:public_user).display_name # Check that the marking a message read works post :mark, :message_id => messages(:unread_message).id, :mark => "read" @@ -285,9 +308,9 @@ class MessageControllerTest < ActionController::TestCase assert_equal false, Message.find(messages(:unread_message).id).message_read # Asking to mark a message with no ID should fail - post :mark - assert_response :not_found - assert_template "no_such_message" + assert_raise ActionController::UrlGenerationError do + post :mark + end # Asking to mark a message with a bogus ID should fail post :mark, :message_id => 99999 @@ -304,7 +327,6 @@ class MessageControllerTest < ActionController::TestCase # Login as a user with no messages session[:user] = users(:second_public_user).id - cookies["_osm_username"] = users(:second_public_user).display_name # Check that deleting a message we didn't send or receive fails post :delete, :message_id => messages(:read_message).id @@ -313,7 +335,6 @@ class MessageControllerTest < ActionController::TestCase # Login as the message recipient session[:user] = users(:normal_user).id - cookies["_osm_username"] = users(:normal_user).display_name # Check that the deleting a received message works post :delete, :message_id => messages(:read_message).id @@ -332,9 +353,9 @@ class MessageControllerTest < ActionController::TestCase assert_equal true, m.to_user_visible # Asking to delete a message with no ID should fail - post :delete - assert_response :not_found - assert_template "no_such_message" + assert_raise ActionController::UrlGenerationError do + post :delete + end # Asking to delete a message with a bogus ID should fail post :delete, :message_id => 99999