# 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 },
)
assert_routing(
{ :path => "/message/delete/1", :method => :post },
- { :controller => "messages", :action => "delete", :message_id => "1" }
+ { :controller => "messages", :action => "destroy", :message_id => "1" }
)
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
assert_select "textarea#message_body", :count => 1
assert_select "input[type='submit'][value='Send']", :count => 1
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
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
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
# 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
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{#{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_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
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
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)
- # 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 :show, :params => { :id => unread_message.id }
+ assert_redirected_to login_path(:referer => message_path(:id => unread_message.id))
# Login as the wrong user
session[:user] = other_user.id
# 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))
+ get :show, :params => { :id => unread_message.id }
+ assert_redirected_to login_path(:referer => message_path(: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]
# Login as the message sender
session[:user] = user.id
# Check that the message sender can read the message
- get :read, :params => { :message_id => unread_message.id }
+ get :show, :params => { :id => unread_message.id }
assert_response :success
- assert_template "read"
+ assert_template "show"
assert_equal false, Message.find(unread_message.id).message_read
# Login as the message recipient
session[:user] = recipient_user.id
# Check that the message recipient can read the message
- get :read, :params => { :message_id => unread_message.id }
+ get :show, :params => { :id => unread_message.id }
assert_response :success
- assert_template "read"
+ assert_template "show"
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
+ get :show
end
# Asking to read a message with a bogus ID should fail
- get :read, :params => { :message_id => 99999 }
+ get :show, :params => { :id => 99999 }
assert_response :not_found
assert_template "no_such_message"
end
# 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
+ assert_redirected_to login_path(:referer => inbox_messages_path)
# Login
session[:user] = user.id
# Check that we can view our inbox when logged in
- get :inbox, :params => { :display_name => user.display_name }
+ get :inbox
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
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)
# 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
+ assert_redirected_to login_path(:referer => outbox_messages_path)
# Login
session[:user] = user.id
# Check that we can view our outbox when logged in
- get :outbox, :params => { :display_name => user.display_name }
+ get :outbox
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
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
##
# 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_redirected_to inbox_messages_path
assert_equal true, Message.find(unread_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_redirected_to inbox_messages_path
assert_equal false, Message.find(unread_message.id).message_read
# Check that the marking a message read via XHR works
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
+ post :destroy, :params => { :message_id => read_message.id }
assert_response :forbidden
# Login as a user with no messages
session[:user] = other_user.id
- # 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
+ post :destroy, :params => { :message_id => read_message.id }
assert_response :not_found
assert_template "no_such_message"
# Login as the message recipient_user
session[:user] = user.id
- # 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
+ post :destroy, :params => { :message_id => read_message.id }
+ 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
- # 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
+ post :destroy, :params => { :message_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)
assert_equal false, m.from_user_visible
assert_equal true, m.to_user_visible
- # Asking to delete a message with no ID should fail
+ # Asking to destroy a message with no ID should fail
assert_raise ActionController::UrlGenerationError do
- post :delete
+ post :destroy
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
+ post :destroy, :params => { :message_id => 99999 }
assert_response :not_found
assert_template "no_such_message"
end
projects / rails.git / blobdiff