if @message.save
flash[:notice] = t ".message_sent"
Notifier.message_notification(@message).deliver_now
- redirect_to :action => "inbox", :display_name => current_user.display_name
+ redirect_to :action => :inbox
end
end
end
redirect_to :controller => "user", :action => "login", :referer => request.fullpath
end
rescue ActiveRecord::RecordNotFound
- @title = t "message.no_such_message.title"
+ @title = t "messages.no_such_message.title"
render :action => "no_such_message", :status => :not_found
end
# Show a message
def show
@title = t ".title"
- @message = Message.find(params[:message_id])
+ @message = Message.find(params[:id])
if @message.recipient == current_user || @message.sender == current_user
@message.message_read = true if @message.recipient == current_user
redirect_to :controller => "user", :action => "login", :referer => request.fullpath
end
rescue ActiveRecord::RecordNotFound
- @title = t "message.no_such_message.title"
+ @title = t "messages.no_such_message.title"
render :action => "no_such_message", :status => :not_found
end
# Display the list of messages that have been sent to the user.
def inbox
@title = t ".title"
- if current_user && params[:display_name] == current_user.display_name
- else
- redirect_to :action => "inbox", :display_name => current_user.display_name
- end
end
# Display the list of messages that the user has sent to other users.
def outbox
@title = t ".title"
- if current_user && params[:display_name] == current_user.display_name
- else
- redirect_to :action => "outbox", :display_name => current_user.display_name
- end
end
# Set the message as being read or unread.
@message.message_read = message_read
if @message.save && !request.xhr?
flash[:notice] = notice
- redirect_to :action => "inbox", :display_name => current_user.display_name
+ redirect_to :action => :inbox
end
rescue ActiveRecord::RecordNotFound
- @title = t "message.no_such_message.title"
+ @title = t "messages.no_such_message.title"
render :action => "no_such_message", :status => :not_found
end
if params[:referer]
redirect_to params[:referer]
else
- redirect_to :action => "inbox", :display_name => current_user.display_name
+ redirect_to :action => :inbox
end
end
rescue ActiveRecord::RecordNotFound
- @title = t "message.no_such_message.title"
+ @title = t "messages.no_such_message.title"
render :action => "no_such_message", :status => :not_found
end
# 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/read/1", :method => :get },
- { :controller => "messages", :action => "show", :message_id => "1" }
+ { :path => "/messages/1", :method => :get },
+ { :controller => "messages", :action => "show", :id => "1" }
)
assert_routing(
{ :path => "/message/mark/1", :method => :post },
: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 %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
unread_message = create(:message, :unread, :sender => user, :recipient => recipient_user)
# Check that the show message page requires us to login
- get :show, :params => { :message_id => unread_message.id }
- assert_redirected_to login_path(:referer => 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))
# Login as the wrong user
session[:user] = other_user.id
# Check that we can't read the message
- get :show, :params => { :message_id => unread_message.id }
- assert_redirected_to login_path(:referer => 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 :show, :params => { :message_id => unread_message.id }
+ get :show, :params => { :id => unread_message.id }
assert_response :success
assert_template "show"
assert_equal false, Message.find(unread_message.id).message_read
session[:user] = recipient_user.id
# Check that the message recipient can read the message
- get :show, :params => { :message_id => unread_message.id }
+ get :show, :params => { :id => unread_message.id }
assert_response :success
assert_template "show"
assert_equal true, Message.find(unread_message.id).message_read
end
# Asking to read a message with a bogus ID should fail
- get :show, :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
# Check that the destroy a received message works
post :destroy, :params => { :message_id => read_message.id }
- assert_redirected_to inbox_path(:display_name => user.display_name)
+ 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 destroying a sent message works
- post :destroy, :params => { :message_id => sent_message.id, :referer => outbox_path(:display_name => user.display_name) }
- assert_redirected_to outbox_path(:display_name => user.display_name)
+ 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
projects / rails.git / commitdiff