X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/d14cf519fd876274900758a903e7e390d38922d5..HEAD:/test/controllers/messages_controller_test.rb diff --git a/test/controllers/messages_controller_test.rb b/test/controllers/messages_controller_test.rb index dd9df8f45..db3a200b6 100644 --- a/test/controllers/messages_controller_test.rb +++ b/test/controllers/messages_controller_test.rb @@ -1,44 +1,44 @@ require "test_helper" -class MessagesControllerTest < ActionController::TestCase +class MessagesControllerTest < ActionDispatch::IntegrationTest ## # test all routes which lead to this controller def test_routes assert_routing( - { :path => "/user/username/inbox", :method => :get }, - { :controller => "messages", :action => "inbox", :display_name => "username" } + { :path => "/messages/inbox", :method => :get }, + { :controller => "messages", :action => "inbox" } ) assert_routing( - { :path => "/user/username/outbox", :method => :get }, - { :controller => "messages", :action => "outbox", :display_name => "username" } + { :path => "/messages/outbox", :method => :get }, + { :controller => "messages", :action => "outbox" } ) assert_routing( { :path => "/message/new/username", :method => :get }, { :controller => "messages", :action => "new", :display_name => "username" } ) assert_routing( - { :path => "/message/new/username", :method => :post }, - { :controller => "messages", :action => "new", :display_name => "username" } + { :path => "/messages", :method => :post }, + { :controller => "messages", :action => "create" } ) assert_routing( - { :path => "/message/read/1", :method => :get }, - { :controller => "messages", :action => "read", :message_id => "1" } + { :path => "/messages/1", :method => :get }, + { :controller => "messages", :action => "show", :id => "1" } ) assert_routing( - { :path => "/message/mark/1", :method => :post }, + { :path => "/messages/1/mark", :method => :post }, { :controller => "messages", :action => "mark", :message_id => "1" } ) assert_routing( - { :path => "/message/reply/1", :method => :get }, + { :path => "/messages/1/reply", :method => :get }, { :controller => "messages", :action => "reply", :message_id => "1" } ) assert_routing( - { :path => "/message/reply/1", :method => :post }, + { :path => "/messages/1/reply", :method => :post }, { :controller => "messages", :action => "reply", :message_id => "1" } ) assert_routing( - { :path => "/message/delete/1", :method => :post }, - { :controller => "messages", :action => "delete", :message_id => "1" } + { :path => "/messages/1", :method => :delete }, + { :controller => "messages", :action => "destroy", :id => "1" } ) end @@ -47,8 +47,8 @@ class MessagesControllerTest < ActionController::TestCase def test_new_no_login # Check that the new message page requires us to login user = create(:user) - get :new, :params => { :display_name => user.display_name } - assert_redirected_to login_path(:referer => new_message_path(:display_name => user.display_name)) + get new_message_path(user) + assert_redirected_to login_path(:referer => new_message_path(user)) end ## @@ -57,14 +57,16 @@ class MessagesControllerTest < ActionController::TestCase # Login as a normal user user = create(:user) recipient_user = create(:user) - session[:user] = user.id + session_for(user) # Check that the new message page loads - get :new, :params => { :display_name => recipient_user.display_name } + get new_message_path(recipient_user) assert_response :success assert_template "new" assert_select "title", "Send message | OpenStreetMap" - assert_select "form[action='#{new_message_path(:display_name => recipient_user.display_name)}']", :count => 1 do + assert_select "a[href='#{user_path recipient_user}']", :text => recipient_user.display_name + 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", :count => 1 assert_select "textarea#message_body", :count => 1 assert_select "input[type='submit'][value='Send']", :count => 1 @@ -77,20 +79,21 @@ class MessagesControllerTest < ActionController::TestCase # Login as a normal user user = create(:user) recipient_user = create(:user) - session[:user] = user.id + session_for(user) # Check that we can't send a message from a GET request assert_difference "ActionMailer::Base.deliveries.size", 0 do assert_difference "Message.count", 0 do - get :new, - :params => { :display_name => recipient_user.display_name, - :message => { :title => "Test Message", :body => "Test message body" } } + perform_enqueued_jobs do + get new_message_path(recipient_user, :message => { :title => "Test Message", :body => "Test message body" }) + end end end assert_response :success assert_template "new" assert_select "title", "Send message | OpenStreetMap" - assert_select "form[action='#{new_message_path(:display_name => recipient_user.display_name)}']", :count => 1 do + 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", :count => 1 do assert_select "[value='Test Message']" end @@ -105,20 +108,22 @@ class MessagesControllerTest < ActionController::TestCase # Login as a normal user user = create(:user) recipient_user = create(:user) - session[:user] = user.id + session_for(user) # Check that the subject is preserved over errors assert_difference "ActionMailer::Base.deliveries.size", 0 do assert_difference "Message.count", 0 do - post :new, - :params => { :display_name => recipient_user.display_name, - :message => { :title => "Test Message", :body => "" } } + perform_enqueued_jobs do + post messages_path(:display_name => recipient_user.display_name, + :message => { :title => "Test Message", :body => "" }) + end end end assert_response :success assert_template "new" assert_select "title", "Send message | OpenStreetMap" - assert_select "form[action='#{new_message_path(:display_name => recipient_user.display_name)}']", :count => 1 do + 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", :count => 1 do assert_select "[value='Test Message']" end @@ -133,20 +138,22 @@ class MessagesControllerTest < ActionController::TestCase # Login as a normal user user = create(:user) recipient_user = create(:user) - session[:user] = user.id + session_for(user) # 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, - :params => { :display_name => recipient_user.display_name, - :message => { :title => "", :body => "Test message body" } } + perform_enqueued_jobs do + post messages_path(:display_name => recipient_user.display_name, + :message => { :title => "", :body => "Test message body" }) + end end end assert_response :success assert_template "new" assert_select "title", "Send message | OpenStreetMap" - assert_select "form[action='#{new_message_path(:display_name => recipient_user.display_name)}']", :count => 1 do + 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", :count => 1 do assert_select "[value='']" end @@ -161,37 +168,38 @@ class MessagesControllerTest < ActionController::TestCase # Login as a normal user user = create(:user) recipient_user = create(:user) - session[:user] = user.id + session_for(user) # Check that sending a message works assert_difference "ActionMailer::Base.deliveries.size", 1 do assert_difference "Message.count", 1 do - post :new, - :params => { :display_name => recipient_user.display_name, - :message => { :title => "Test Message", :body => "Test message body" } } + perform_enqueued_jobs do + post messages_path(:display_name => recipient_user.display_name, + :message => { :title => "Test Message", :body => "Test message body" }) + end end end - assert_redirected_to inbox_path(:display_name => user.display_name) + assert_redirected_to inbox_messages_path assert_equal "Message sent", flash[:notice] e = ActionMailer::Base.deliveries.first assert_equal [recipient_user.email], e.to assert_equal "[OpenStreetMap] Test Message", e.subject - assert_match /Test message body/, e.text_part.decoded - assert_match /Test message body/, e.html_part.decoded - assert_match %r{#{SERVER_URL}/message/read/}, e.text_part.decoded + assert_match(/Test message body/, e.text_part.decoded) + assert_match(/Test message body/, e.html_part.decoded) + assert_match %r{#{Settings.server_url}/messages/[0-9]+}, e.text_part.decoded ActionMailer::Base.deliveries.clear m = Message.last assert_equal user.id, m.from_user_id assert_equal recipient_user.id, m.to_user_id - assert_in_delta Time.now, m.sent_on, 2 + assert_in_delta Time.now.utc, 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 a bogus user name should fail - get :new, :params => { :display_name => "non_existent_user" } + get new_message_path("non_existent_user") assert_response :not_found - assert_template "user/no_such_user" + assert_template "users/no_such_user" assert_select "h1", "The user non_existent_user does not exist" end @@ -201,18 +209,19 @@ class MessagesControllerTest < ActionController::TestCase # Login as a normal user user = create(:user) recipient_user = create(:user) - session[:user] = user.id + session_for(user) # Check that sending a message fails when the message limit is hit assert_no_difference "ActionMailer::Base.deliveries.size" do assert_no_difference "Message.count" do - with_message_limit(0) do - post :new, - :params => { :display_name => recipient_user.display_name, - :message => { :title => "Test Message", :body => "Test message body" } } - assert_response :success - assert_template "new" - assert_select ".error", /wait a while/ + with_settings(:max_messages_per_hour => 0) do + perform_enqueued_jobs do + post messages_path(:display_name => recipient_user.display_name, + :message => { :title => "Test Message", :body => "Test message body" }) + assert_response :success + assert_template "new" + assert_select ".alert.alert-danger", /wait a while/ + end end end end @@ -224,91 +233,84 @@ class MessagesControllerTest < ActionController::TestCase user = create(:user) recipient_user = create(:user) other_user = create(:user) - unread_message = create(:message, :unread, :sender => user, :recipient => recipient_user) + message = create(:message, :unread, :sender => user, :recipient => recipient_user) # Check that the message reply page requires us to login - get :reply, :params => { :message_id => unread_message.id } - assert_redirected_to login_path(:referer => reply_message_path(:message_id => unread_message.id)) + get message_reply_path(message) + assert_redirected_to login_path(:referer => message_reply_path(message)) # Login as the wrong user - session[:user] = other_user.id + session_for(other_user) # Check that we can't reply to somebody else's message - get :reply, :params => { :message_id => unread_message.id } - assert_redirected_to login_path(:referer => reply_message_path(:message_id => unread_message.id)) - 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 login as the correct user in order to reply.", flash[:notice] + 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[:user] = recipient_user.id + session_for(recipient_user) # Check that the message reply page loads - get :reply, :params => { :message_id => unread_message.id } + get message_reply_path(message) assert_response :success assert_template "new" - assert_select "title", "Re: #{unread_message.title} | OpenStreetMap" - assert_select "form[action='#{new_message_path(:display_name => user.display_name)}']", :count => 1 do - assert_select "input#message_title[value='Re: #{unread_message.title}']", :count => 1 + 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_equal true, Message.find(unread_message.id).message_read - - # Asking to reply to a message with no ID should fail - assert_raise ActionController::UrlGenerationError do - get :reply - end + assert Message.find(message.id).message_read # Asking to reply to a message with a bogus ID should fail - get :reply, :params => { :message_id => 99999 } + get message_reply_path(99999) assert_response :not_found assert_template "no_such_message" end ## - # test the read action - def test_read + # test the show action + def test_show user = create(:user) recipient_user = create(:user) other_user = create(:user) - unread_message = create(:message, :unread, :sender => user, :recipient => recipient_user) + message = create(:message, :unread, :sender => user, :recipient => recipient_user) - # Check that the read message page requires us to login - get :read, :params => { :message_id => unread_message.id } - assert_redirected_to login_path(:referer => read_message_path(:message_id => unread_message.id)) + # Check that the show message page requires us to login + get message_path(message) + assert_redirected_to login_path(:referer => message_path(message)) # Login as the wrong user - session[:user] = other_user.id + session_for(other_user) # Check that we can't read the message - get :read, :params => { :message_id => unread_message.id } - assert_redirected_to login_path(:referer => read_message_path(:message_id => unread_message.id)) - 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 login as the correct user in order to read it.", flash[:notice] + 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[:user] = user.id + session_for(user) # Check that the message sender can read the message - get :read, :params => { :message_id => unread_message.id } + get message_path(message) assert_response :success - assert_template "read" - assert_equal false, Message.find(unread_message.id).message_read + assert_template "show" + assert_select "a[href='#{user_path recipient_user}']", :text => recipient_user.display_name + assert_not Message.find(message.id).message_read # Login as the message recipient - session[:user] = recipient_user.id + session_for(recipient_user) # Check that the message recipient can read the message - get :read, :params => { :message_id => unread_message.id } + get message_path(message) assert_response :success - assert_template "read" - assert_equal true, Message.find(unread_message.id).message_read - - # Asking to read a message with no ID should fail - assert_raise ActionController::UrlGenerationError do - get :read - end + 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 :read, :params => { :message_id => 99999 } + get message_path(99999) assert_response :not_found assert_template "no_such_message" end @@ -317,55 +319,51 @@ class MessagesControllerTest < ActionController::TestCase # test the inbox action def test_inbox user = create(:user) - other_user = create(:user) read_message = create(:message, :read, :recipient => user) # Check that the inbox page requires us to login - get :inbox, :params => { :display_name => user.display_name } - assert_redirected_to login_path(:referer => inbox_path(:display_name => user.display_name)) + get inbox_messages_path + assert_redirected_to login_path(:referer => inbox_messages_path) # Login - session[:user] = user.id + session_for(user) # Check that we can view our inbox when logged in - get :inbox, :params => { :display_name => user.display_name } + get inbox_messages_path assert_response :success assert_template "inbox" - assert_select "table.messages", :count => 1 do - assert_select "tr", :count => 2 - assert_select "tr#inbox-#{read_message.id}.inbox-row", :count => 1 + 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 - - # Check that we can't view somebody else's inbox when logged in - get :inbox, :params => { :display_name => other_user.display_name } - assert_redirected_to inbox_path(:display_name => user.display_name) end ## # test the outbox action def test_outbox user = create(:user) - other_user = create(:user) - create(:message, :sender => user) + message = create(:message, :sender => user) # Check that the outbox page requires us to login - get :outbox, :params => { :display_name => user.display_name } - assert_redirected_to login_path(:referer => outbox_path(:display_name => user.display_name)) + get outbox_messages_path + assert_redirected_to login_path(:referer => outbox_messages_path) # Login - session[:user] = user.id + session_for(user) # Check that we can view our outbox when logged in - get :outbox, :params => { :display_name => user.display_name } + get outbox_messages_path assert_response :success assert_template "outbox" - assert_select "table.messages", :count => 1 do - assert_select "tr", :count => 2 - assert_select "tr.inbox-row", :count => 1 + 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 - - # Check that we can't view somebody else's outbox when logged in - get :outbox, :params => { :display_name => other_user.display_name } - assert_redirected_to outbox_path(:display_name => user.display_name) end ## @@ -374,116 +372,92 @@ class MessagesControllerTest < ActionController::TestCase user = create(:user) recipient_user = create(:user) other_user = create(:user) - unread_message = create(:message, :unread, :sender => user, :recipient => recipient_user) + message = create(:message, :unread, :sender => user, :recipient => recipient_user) # Check that the marking a message requires us to login - post :mark, :params => { :message_id => unread_message.id } + post message_mark_path(message) assert_response :forbidden # Login as a user with no messages - session[:user] = other_user.id + session_for(other_user) # Check that marking a message we didn't send or receive fails - post :mark, :params => { :message_id => unread_message.id } + post message_mark_path(message) assert_response :not_found assert_template "no_such_message" # Login as the message recipient_user - session[:user] = recipient_user.id + session_for(recipient_user) # Check that the marking a message read works - post :mark, :params => { :message_id => unread_message.id, :mark => "read" } - assert_redirected_to inbox_path(:display_name => recipient_user.display_name) - assert_equal true, Message.find(unread_message.id).message_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 :mark, :params => { :message_id => unread_message.id, :mark => "unread" } - assert_redirected_to inbox_path(:display_name => recipient_user.display_name) - assert_equal false, Message.find(unread_message.id).message_read + 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 via XHR works - post :mark, :xhr => true, :params => { :message_id => unread_message.id, :mark => "read" } - assert_response :success - assert_template "mark" - assert_equal true, Message.find(unread_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 Message.find(message.id).message_read - # Check that the marking a message unread via XHR works - post :mark, :xhr => true, :params => { :message_id => unread_message.id, :mark => "unread" } - assert_response :success - assert_template "mark" - assert_equal false, Message.find(unread_message.id).message_read - - # Asking to mark a message with no ID should fail - assert_raise ActionController::UrlGenerationError do - post :mark - end + # 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_not Message.find(message.id).message_read # Asking to mark a message with a bogus ID should fail - post :mark, :params => { :message_id => 99999 } + post message_mark_path(99999) assert_response :not_found assert_template "no_such_message" end ## - # test the delete action - def test_delete + # test the destroy action + def test_destroy user = create(:user) second_user = create(:user) other_user = create(:user) read_message = create(:message, :read, :recipient => user, :sender => second_user) sent_message = create(:message, :unread, :recipient => second_user, :sender => user) - # Check that the deleting a message requires us to login - post :delete, :params => { :message_id => read_message.id } + # Check that destroying a message requires us to login + delete message_path(read_message) assert_response :forbidden # Login as a user with no messages - session[:user] = other_user.id + session_for(other_user) - # Check that deleting a message we didn't send or receive fails - post :delete, :params => { :message_id => read_message.id } + # Check that destroying a message we didn't send or receive fails + delete message_path(read_message) assert_response :not_found assert_template "no_such_message" # Login as the message recipient_user - session[:user] = user.id + session_for(user) - # Check that the deleting a received message works - post :delete, :params => { :message_id => read_message.id } - assert_redirected_to inbox_path(:display_name => user.display_name) + # Check that the destroy a received message works + delete message_path(read_message) + assert_redirected_to inbox_messages_path assert_equal "Message deleted", flash[:notice] m = Message.find(read_message.id) - assert_equal true, m.from_user_visible - assert_equal false, m.to_user_visible + assert m.from_user_visible + assert_not m.to_user_visible - # Check that the deleting a sent message works - post :delete, :params => { :message_id => sent_message.id, :referer => outbox_path(:display_name => user.display_name) } - assert_redirected_to outbox_path(:display_name => user.display_name) + # Check that the destroying a sent message works + 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) - assert_equal false, m.from_user_visible - assert_equal true, m.to_user_visible + assert_not m.from_user_visible + assert m.to_user_visible - # Asking to delete a message with no ID should fail - assert_raise ActionController::UrlGenerationError do - post :delete - end - - # Asking to delete a message with a bogus ID should fail - post :delete, :params => { :message_id => 99999 } + # Asking to destroy a message with a bogus ID should fail + delete message_path(99999) assert_response :not_found assert_template "no_such_message" end - - private - - def with_message_limit(value) - max_messages_per_hour = Object.send("remove_const", "MAX_MESSAGES_PER_HOUR") - Object.const_set("MAX_MESSAGES_PER_HOUR", value) - - yield - - Object.send("remove_const", "MAX_MESSAGES_PER_HOUR") - Object.const_set("MAX_MESSAGES_PER_HOUR", max_messages_per_hour) - end end