cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/pull/1893'

Browse source
This commit is contained in:
Tom Hughes 2018-06-06 14:33:36 +01:00
commit 4df0fe72e2
9 changed files with 49 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.rubocop_todo.yml
View file

@ -67,7 +67,7 @@ Metrics/AbcSize:
# Offense count: 41
# Configuration parameters: CountComments, ExcludedMethods.
Metrics/BlockLength:
Max: 240
Max: 245
# Offense count: 12
# Configuration parameters: CountBlocks.

24
app/controllers/messages_controller.rb
View file

@ -26,7 +26,7 @@ class MessagesController < ApplicationController
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
@ -56,14 +56,14 @@ class MessagesController < ApplicationController
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
@ -73,26 +73,18 @@ class MessagesController < ApplicationController
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.
@ -108,10 +100,10 @@ class MessagesController < ApplicationController
@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
@ -126,11 +118,11 @@ class MessagesController < ApplicationController
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

2
app/views/layouts/_header.html.erb
View file

@ -64,7 +64,7 @@
</a>
<ul class='dropdown-menu'>
<li>
<%= link_to inbox_path(:display_name => current_user.display_name) do %>
<%= link_to inbox_messages_path do %>
<span class='count-number'><%= number_with_delimiter(current_user.new_messages.size) %></span>
<%= t('user.view.my messages') %>
<% end %>

2
app/views/messages/inbox.html.erb
View file

@ -3,7 +3,7 @@
<% end %>
<% content_for :heading do %>
<h2><%= t '.my_inbox'%>/<%= link_to t('.outbox'), outbox_path(current_user.display_name) %></h2>
<h2><%= t '.my_inbox'%>/<%= link_to t('.outbox'), outbox_messages_path %></h2>
<% end %>
<h4><%= render :partial => "message_count" %></h4>

2
app/views/messages/new.html.erb
View file

@ -16,7 +16,7 @@
</div>
<div class='buttons'>
<%= submit_tag t('.send_button') %>
<%= link_to t('.back_to_inbox'), inbox_path(current_user), :class => 'deemphasize button' %>
<%= link_to t('.back_to_inbox'), inbox_messages_path, :class => 'deemphasize button' %>
</div>
</fieldset>
<% end %>

2
app/views/messages/outbox.html.erb
View file

@ -3,7 +3,7 @@
<% end %>
<% content_for :heading do %>
<h2><%= raw(t '.my_inbox', :inbox_link => link_to(t('.inbox'), inbox_path(current_user.display_name))) %>/<%= t'.outbox' %></h2>
<h2><%= raw(t '.my_inbox', :inbox_link => link_to(t('.inbox'), inbox_messages_path)) %>/<%= t'.outbox' %></h2>
<% end %>
<h4><%= t '.messages', :count => current_user.sent_messages.size %></h4>

2
app/views/messages/show.html.erb
View file

@ -36,5 +36,5 @@
<% end %>
<%= link_to t('.back'), outbox_path(current_user), :class => "button deemphasize" %>
<%= link_to t('.back'), outbox_messages_path, :class => "button deemphasize" %>
</div>

12
config/routes.rb
View file

@ -261,10 +261,16 @@ OpenStreetMap::Application.routes.draw do
get "/export/embed" => "export#embed"
# messages
get "/user/:display_name/inbox" => "messages#inbox", :as => "inbox"
get "/user/:display_name/outbox" => "messages#outbox", :as => "outbox"
resources :messages, :only => [:show] do
collection do
get :inbox
get :outbox
end
end
get "/user/:display_name/inbox", :to => redirect(:path => "/messages/inbox")
get "/user/:display_name/outbox", :to => redirect(:path => "/messages/outbox")
match "/message/new/:display_name" => "messages#new", :via => [:get, :post], :as => "new_message"
get "/message/read/:message_id" => "messages#show", :as => "message"
get "/message/read/:message_id", :to => redirect(:path => "/messages/%{message_id}")
post "/message/mark/:message_id" => "messages#mark", :as => "mark_message"
match "/message/reply/:message_id" => "messages#reply", :via => [:get, :post], :as => "reply_message"
post "/message/delete/:message_id" => "messages#destroy", :as => "destroy_message"

62
test/controllers/messages_controller_test.rb
View file

@ -5,12 +5,12 @@ class MessagesControllerTest < ActionController::TestCase
# 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 },
@ -21,8 +21,8 @@ class MessagesControllerTest < ActionController::TestCase
{ :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 },
@ -171,14 +171,14 @@ class MessagesControllerTest < ActionController::TestCase
: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
@ -273,22 +273,22 @@ class MessagesControllerTest < ActionController::TestCase
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
@ -297,7 +297,7 @@ class MessagesControllerTest < ActionController::TestCase
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
@ -308,7 +308,7 @@ class MessagesControllerTest < ActionController::TestCase
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
@ -317,55 +317,45 @@ 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
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
##
@ -393,12 +383,12 @@ class MessagesControllerTest < ActionController::TestCase
# 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
@ -450,15 +440,15 @@ class MessagesControllerTest < ActionController::TestCase
# 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