X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/d3700e6201b4b78a70bbb2941572edc985b63c2c..b8a8a88004d25837a10436fdc13128146b32c32b:/test/controllers/messages_controller_test.rb?ds=sidebyside diff --git a/test/controllers/messages_controller_test.rb b/test/controllers/messages_controller_test.rb index bffe3e1df..0b3a59b39 100644 --- a/test/controllers/messages_controller_test.rb +++ b/test/controllers/messages_controller_test.rb @@ -17,28 +17,28 @@ class MessagesControllerTest < ActionController::TestCase { :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 => "/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 => "destroy", :message_id => "1" } + { :path => "/messages/1", :method => :delete }, + { :controller => "messages", :action => "destroy", :id => "1" } ) end @@ -64,7 +64,8 @@ class MessagesControllerTest < ActionController::TestCase 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 assert_select "textarea#message_body", :count => 1 assert_select "input[type='submit'][value='Send']", :count => 1 @@ -90,7 +91,8 @@ class MessagesControllerTest < ActionController::TestCase 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 @@ -118,7 +120,8 @@ class MessagesControllerTest < ActionController::TestCase 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 @@ -146,7 +149,8 @@ class MessagesControllerTest < ActionController::TestCase 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 @@ -166,7 +170,7 @@ class MessagesControllerTest < ActionController::TestCase # Check that sending a message works assert_difference "ActionMailer::Base.deliveries.size", 1 do assert_difference "Message.count", 1 do - post :new, + post :create, :params => { :display_name => recipient_user.display_name, :message => { :title => "Test Message", :body => "Test message body" } } end @@ -176,8 +180,8 @@ class MessagesControllerTest < ActionController::TestCase 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(/Test message body/, e.text_part.decoded) + assert_match(/Test message body/, e.html_part.decoded) assert_match %r{#{SERVER_URL}/messages/[0-9]+}, e.text_part.decoded ActionMailer::Base.deliveries.clear m = Message.last @@ -191,7 +195,7 @@ class MessagesControllerTest < ActionController::TestCase # Asking to send a message with a bogus user name should fail get :new, :params => { :display_name => "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 @@ -207,7 +211,7 @@ class MessagesControllerTest < ActionController::TestCase assert_no_difference "ActionMailer::Base.deliveries.size" do assert_no_difference "Message.count" do with_message_limit(0) do - post :new, + post :create, :params => { :display_name => recipient_user.display_name, :message => { :title => "Test Message", :body => "Test message body" } } assert_response :success @@ -228,14 +232,14 @@ class MessagesControllerTest < ActionController::TestCase # 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)) + assert_redirected_to login_path(:referer => message_reply_path(:message_id => unread_message.id)) # Login as the wrong user session[:user] = other_user.id # 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_redirected_to login_path(:referer => message_reply_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] # Login as the right user @@ -246,7 +250,8 @@ class MessagesControllerTest < ActionController::TestCase 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 "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: #{unread_message.title}']", :count => 1 assert_select "textarea#message_body", :count => 1 assert_select "input[type='submit'][value='Send']", :count => 1 @@ -424,14 +429,14 @@ class MessagesControllerTest < ActionController::TestCase sent_message = create(:message, :unread, :recipient => second_user, :sender => user) # Check that destroying a message requires us to login - post :destroy, :params => { :message_id => read_message.id } + delete :destroy, :params => { :id => read_message.id } assert_response :forbidden # Login as a user with no messages session[:user] = other_user.id # Check that destroying a message we didn't send or receive fails - post :destroy, :params => { :message_id => read_message.id } + delete :destroy, :params => { :id => read_message.id } assert_response :not_found assert_template "no_such_message" @@ -439,7 +444,7 @@ class MessagesControllerTest < ActionController::TestCase session[:user] = user.id # Check that the destroy a received message works - post :destroy, :params => { :message_id => read_message.id } + delete :destroy, :params => { :id => read_message.id } assert_redirected_to inbox_messages_path assert_equal "Message deleted", flash[:notice] m = Message.find(read_message.id) @@ -447,7 +452,7 @@ class MessagesControllerTest < ActionController::TestCase assert_equal false, m.to_user_visible # Check that the destroying a sent message works - post :destroy, :params => { :message_id => sent_message.id, :referer => outbox_messages_path } + delete :destroy, :params => { :id => sent_message.id, :referer => outbox_messages_path } assert_redirected_to outbox_messages_path assert_equal "Message deleted", flash[:notice] m = Message.find(sent_message.id) @@ -460,7 +465,7 @@ class MessagesControllerTest < ActionController::TestCase end # Asking to destroy a message with a bogus ID should fail - post :destroy, :params => { :message_id => 99999 } + delete :destroy, :params => { :id => 99999 } assert_response :not_found assert_template "no_such_message" end