before_action :authorize_web
before_action :set_locale
before_action :require_user, :only => [:new, :edit, :comment, :hide, :hidecomment, :subscribe, :unsubscribe]
- before_action :lookup_user, :only => [:view, :comments]
+ before_action :lookup_user, :only => [:show, :comments]
before_action :check_database_readable
before_action :check_database_writable, :only => [:new, :edit, :comment, :hide, :hidecomment, :subscribe, :unsubscribe]
before_action :require_administrator, :only => [:hide, :hidecomment]
- before_action :allow_thirdparty_images, :only => [:new, :edit, :list, :view, :comments]
+ before_action :allow_thirdparty_images, :only => [:new, :edit, :list, :show, :comments]
def new
@title = t "diary_entry.new.title"
@diary_entry = DiaryEntry.find(params[:id])
if current_user != @diary_entry.user
- redirect_to :action => "view", :id => params[:id]
+ redirect_to diary_entry_path(@diary_entry.user, @diary_entry)
elsif params[:diary_entry] && @diary_entry.update(entry_params)
- redirect_to :action => "view", :id => params[:id]
+ redirect_to diary_entry_path(@diary_entry.user, @diary_entry)
end
set_map_location
# Add the commenter to the subscribers if necessary
@entry.subscriptions.create(:user => current_user) unless @entry.subscribers.exists?(current_user.id)
- redirect_to :action => "view", :display_name => @entry.user.display_name, :id => @entry.id
+ redirect_to diary_entry_path(@entry.user, @entry)
else
- render :action => "view"
+ render :action => "show"
end
rescue ActiveRecord::RecordNotFound
render :action => "no_such_entry", :status => :not_found
diary_entry.subscriptions.create(:user => current_user) unless diary_entry.subscribers.exists?(current_user.id)
- redirect_to :action => "view", :display_name => diary_entry.user.display_name, :id => diary_entry.id
+ redirect_to diary_entry_path(diary_entry.user, diary_entry)
rescue ActiveRecord::RecordNotFound
render :action => "no_such_entry", :status => :not_found
end
diary_entry.subscriptions.where(:user => current_user).delete_all if diary_entry.subscribers.exists?(current_user.id)
- redirect_to :action => "view", :display_name => diary_entry.user.display_name, :id => diary_entry.id
+ redirect_to diary_entry_path(diary_entry.user, diary_entry)
rescue ActiveRecord::RecordNotFound
render :action => "no_such_entry", :status => :not_found
end
@entries = @entries.visible.includes(:user).order("created_at DESC").limit(20)
end
- def view
+ def show
@entry = @user.diary_entries.visible.where(:id => params[:id]).first
if @entry
- @title = t "diary_entry.view.title", :user => params[:display_name], :title => @entry.title
+ @title = t "diary_entry.show.title", :user => params[:display_name], :title => @entry.title
else
@title = t "diary_entry.no_such_entry.title", :id => params[:id]
render :action => "no_such_entry", :status => :not_found
def hidecomment
comment = DiaryComment.find(params[:comment])
comment.update(:visible => false)
- redirect_to :action => "view", :display_name => comment.diary_entry.user.display_name, :id => comment.diary_entry.id
+ redirect_to diary_entry_path(comment.diary_entry.user, comment.diary_entry)
end
def comments
def require_administrator
unless current_user.administrator?
flash[:error] = t("user.filter.not_an_administrator")
- redirect_to :action => "view"
+ redirect_to :action => "show"
end
end
around_action :api_call_handle_error, :only => [:api_read, :api_users, :api_details, :api_gpx_files]
before_action :lookup_user_by_id, :only => [:api_read]
before_action :lookup_user_by_name, :only => [:set_status, :delete]
- before_action :allow_thirdparty_images, :only => [:view, :account]
+ before_action :allow_thirdparty_images, :only => [:show, :account]
def terms
@legale = params[:legale] || OSM.ip_to_country(request.remote_ip) || DEFAULT_LEGALE
render :xml => doc.to_s
end
- def view
+ def show
@user = User.find_by(:display_name => params[:display_name])
if @user &&
if params[:referer]
redirect_to params[:referer]
else
- redirect_to :action => "view"
+ redirect_to :action => "show"
end
end
else
if params[:referer]
redirect_to params[:referer]
else
- redirect_to :action => "view"
+ redirect_to :action => "show"
end
end
else
def set_status
@user.status = params[:status]
@user.save
- redirect_to :action => "view", :display_name => params[:display_name]
+ redirect_to user_path(:display_name => params[:display_name])
end
##
# delete a user, marking them as deleted and removing personal data
def delete
@user.delete
- redirect_to :action => "view", :display_name => params[:display_name]
+ redirect_to user_path(:display_name => params[:display_name])
end
##
flash[:error] = t("user.filter.not_an_administrator")
if params[:display_name]
- redirect_to :action => "view", :display_name => params[:display_name]
+ redirect_to user_path(:display_name => params[:display_name])
else
redirect_to :action => "login", :referer => request.fullpath
end
def reportable_url(reportable)
case reportable
when DiaryEntry
- url_for(:controller => reportable.class.name.underscore, :action => :view, :display_name => reportable.user.display_name, :id => reportable.id)
+ diary_entry_url(reportable.user, reportable)
when User
- url_for(:controller => reportable.class.name.underscore, :action => :view, :display_name => reportable.display_name)
+ user_url(reportable)
when DiaryComment
- url_for(:controller => reportable.diary_entry.class.name.underscore, :action => :view, :display_name => reportable.diary_entry.user.display_name, :id => reportable.diary_entry.id, :anchor => "comment#{reportable.id}")
+ diary_entry_url(reportable.diary_entry.user, reportable.diary_entry, :anchor => "comment#{reportable.id}")
when Note
url_for(:controller => :browse, :action => :note, :id => reportable.id)
end
elsif author.status == "deleted"
t("user.no_such_user.deleted")
else
- link_to h(author.display_name), link_options.merge(:controller => "user", :action => "view", :display_name => author.display_name)
+ link_to h(author.display_name), link_options.merge(:controller => "user", :action => "show", :display_name => author.display_name)
end
end
end
if current_user && current_user.administrator?
if user.has_role?(role)
image = "roles/#{role}"
- alt = t("user.view.role.revoke.#{role}")
- title = t("user.view.role.revoke.#{role}")
+ alt = t("user.show.role.revoke.#{role}")
+ title = t("user.show.role.revoke.#{role}")
url = revoke_role_path(:display_name => user.display_name, :role => role)
confirm = t("user_role.revoke.are_you_sure", :name => user.display_name, :role => role)
else
image = "roles/blank_#{role}"
- alt = t("user.view.role.grant.#{role}")
- title = t("user.view.role.grant.#{role}")
+ alt = t("user.show.role.grant.#{role}")
+ title = t("user.show.role.grant.#{role}")
url = grant_role_path(:display_name => user.display_name, :role => role)
confirm = t("user_role.grant.are_you_sure", :name => user.display_name, :role => role)
end
elsif user.has_role?(role)
image = "roles/#{role}"
- alt = t("user.view.role.#{role}")
- title = t("user.view.role.#{role}")
+ alt = t("user.show.role.#{role}")
+ title = t("user.show.role.#{role}")
end
if image
@from_user = comment.user.display_name
@text = comment.body
@title = comment.diary_entry.title
- @readurl = url_for(:controller => "diary_entry",
- :action => "view",
- :display_name => comment.diary_entry.user.display_name,
- :id => comment.diary_entry.id,
- :anchor => "comment#{comment.id}")
- @commenturl = url_for(:controller => "diary_entry",
- :action => "view",
- :display_name => comment.diary_entry.user.display_name,
- :id => comment.diary_entry.id,
- :anchor => "newcomment")
+ @readurl = diary_entry_url(comment.diary_entry.user, comment.diary_entry, :anchor => "comment#{comment.id}")
+ @commenturl = diary_entry_url(comment.diary_entry.user, comment.diary_entry, :anchor => "newcomment")
@replyurl = new_message_url(comment.user, :message => { :title => "Re: #{comment.diary_entry.title}" })
@author = @from_user
def friend_notification(friend)
with_recipient_locale friend.befriendee do
@friend = friend
- @viewurl = url_for(:controller => "user", :action => "view",
- :display_name => @friend.befriender.display_name)
+ @viewurl = user_url(@friend.befriender)
@friendurl = url_for(:controller => "user", :action => "make_friend",
:display_name => @friend.befriender.display_name)
@author = @friend.befriender.display_name
<%
set_title(changeset_index_title(params, current_user))
if params[:display_name]
- @heading = t('changeset.index.title_user', :user => link_to(params[:display_name], :controller => "user", :action => "view", :display_name => params[:display_name])).html_safe
+ @heading = t('changeset.index.title_user', :user => link_to(params[:display_name], user_path(:display_name => params[:display_name]))).html_safe
else
@heading = @title
end
if changeset.user.data_public?
entry.author do |author|
author.name changeset.user.display_name
- author.uri url_for(:controller => "user", :action => "view", :display_name => changeset.user.display_name, :only_path => false)
+ author.uri user_url(changeset.user, :only_path => false)
end
end
table.tr do |tr|
tr.th t("browse.changeset.belongs_to")
tr.td do |td|
- td.a h(changeset.user.display_name), :href => url_for(:controller => "user", :action => "view", :display_name => changeset.user.display_name, :only_path => false)
+ td.a h(changeset.user.display_name), :href => user_url(changeset.user, :only_path => false)
end
end
end
<%= user_thumbnail diary_entry.user %>
<% end %>
- <h2><%= link_to h(diary_entry.title), :action => 'view', :display_name => diary_entry.user.display_name, :id => diary_entry.id %></h2>
+ <h2><%= link_to h(diary_entry.title), diary_entry_path(diary_entry.user, diary_entry) %></h2>
<small class='deemphasize'>
<%= raw(t '.posted_by', :link_user => (link_to h(diary_entry.user.display_name), user_path(diary_entry.user)), :created => l(diary_entry.created_at, :format => :blog), :language_link => (link_to h(diary_entry.language.name), :controller => 'diary_entry', :action => 'list', :display_name => nil, :language => diary_entry.language_code)) %>
<ul class='secondary-actions clearfix'>
<% if params[:action] == 'list' %>
- <li><%= link_to t('.comment_link'), :action => 'view', :display_name => diary_entry.user.display_name, :id => diary_entry.id, :anchor => 'newcomment' %></li>
+ <li><%= link_to t('.comment_link'), diary_entry_path(diary_entry.user, diary_entry, :anchor => 'newcomment') %></li>
<li><%= link_to t('.reply_link'), new_message_path(diary_entry.user, :message => { :title => "Re: #{diary_entry.title}" }) %></li>
- <li><%= link_to t('.comment_count', :count => diary_entry.visible_comments.count), :action => 'view', :display_name => diary_entry.user.display_name, :id => diary_entry.id, :anchor => 'comments' %></li>
+ <li><%= link_to t('.comment_count', :count => diary_entry.visible_comments.count), diary_entry_path(diary_entry.user, diary_entry, :anchor => 'comments') %></li>
<% end %>
<% if current_user && current_user == diary_entry.user %>
<% @comments.each do |comment| -%>
<% cl = cycle('table0', 'table1') %>
<tr class="<%= cl %>">
- <td width="25%"><%= link_to comment.diary_entry.title, :action => :view, :display_name => comment.diary_entry.user.display_name, :id => comment.diary_entry.id %></td>
+ <td width="25%"><%= link_to comment.diary_entry.title, diary_entry_path(comment.diary_entry.user, comment.diary_entry) %></td>
<td width="25%"><span title="<%= l comment.created_at, :format => :friendly %>"><%= t '.ago', :ago => time_ago_in_words(comment.created_at) %></span></td>
<td width="50%" class="richtext"><%= comment.body.to_html %></td>
</tr>
@entries.each do |entry|
xml.item do
xml.title entry.title
- xml.link url_for(:action => "view", :id => entry.id, :display_name => entry.user.display_name, :only_path => false)
- xml.guid url_for(:action => "view", :id => entry.id, :display_name => entry.user.display_name, :only_path => false)
+ xml.link diary_entry_url(entry.user, entry, :only_path => false)
+ xml.guid diary_entry_url(entry.user, entry, :only_path => false)
xml.description entry.body.to_html
xml.dc :creator, entry.user.display_name
xml.pubDate entry.created_at.to_s(:rfc822)
- xml.comments url_for(:action => "view", :id => entry.id, :display_name => entry.user.display_name, :anchor => "comments", :only_path => false)
+ xml.comments diary_entry_url(entry.user, entry, :anchor => "comments", :only_path => false)
if entry.latitude && entry.longitude
xml.geo :lat, entry.latitude.to_s
<li>
<%= link_to inbox_messages_path do %>
<span class='count-number'><%= number_with_delimiter(current_user.new_messages.size) %></span>
- <%= t('user.view.my messages') %>
+ <%= t('user.show.my messages') %>
<% end %>
</li>
<li>
- <%= link_to t('user.view.my profile'), user_path(:display_name => current_user.display_name) %>
+ <%= link_to t('user.show.my profile'), user_path(:display_name => current_user.display_name) %>
</li>
<li>
- <%= link_to t('user.view.my settings'), :controller => 'user', :action => 'account', :display_name => current_user.display_name %>
+ <%= link_to t('user.show.my settings'), :controller => 'user', :action => 'account', :display_name => current_user.display_name %>
</li>
<li class="divider"></li>
<li>
<h1><%= t ".title" %></h1>
<% end %>
-<p><%= raw t(".request_access", :app_name => link_to(@token.client_application.name, @token.client_application.url), :user => link_to(current_user.display_name, :controller => :user, :action => :view, :display_name => current_user.display_name)) %></p>
+<p><%= raw t(".request_access", :app_name => link_to(@token.client_application.name, @token.client_application.url), :user => link_to(current_user.display_name, user_path(current_user))) %></p>
<%= form_tag authorize_url do %>
<%= hidden_field_tag "oauth_token", @token.token %>
<p>
<% if user.creation_ip %>
<%= raw t 'user.list.summary',
- :name => link_to(h(user.display_name), :action => "view", :display_name => user.display_name),
+ :name => link_to(h(user.display_name), user_path(user)),
:ip_address => link_to(user.creation_ip, :ip => user.creation_ip),
:date => l(user.creation_time, :format => :friendly)
%>
<% else %>
<%= raw t 'user.list.summary_no_ip',
- :name => link_to(h(user.display_name), :action => "view", :display_name => user.display_name),
+ :name => link_to(h(user.display_name), user_path(user)),
:date => l(user.creation_time, :format => :friendly)
%>
<% end %>
<h1><%= t '.my settings' %></h1>
<ul class='secondary-actions clearfix'>
<li><%= link_to t('.return to profile'), user_path(current_user) %></li>
- <li><%= link_to t('user.view.oauth settings'), :controller => 'oauth_clients', :action => 'index' %></li>
+ <li><%= link_to t('user.show.oauth settings'), :controller => 'oauth_clients', :action => 'index' %></li>
</ul>
<% end %>
use_map_link: "use map"
save_button: "Save"
marker_text: Diary entry location
- view:
+ show:
title: "%{user}'s diary | %{title}"
user_title: "%{user}'s diary"
leave_a_comment: "Leave a comment"
heading: "The user %{user} does not exist"
body: "Sorry, there is no user with the name %{user}. Please check your spelling, or maybe the link you clicked is wrong."
deleted: "deleted"
- view:
+ show:
my diary: My Diary
new diary entry: new diary entry
my edits: My Edits
get "/traces/mine/tag/:tag" => "traces#mine"
get "/traces/mine/page/:page" => "traces#mine"
get "/traces/mine" => "traces#mine"
- post "/trace/create" => "traces#create" # remove after deployment
get "/trace/create", :to => redirect(:path => "/traces/new")
get "/trace/:id/data" => "traces#data", :id => /\d+/, :as => "trace_data"
- post "trace/:id/edit" => "traces#update" # remove after deployment
get "/trace/:id/edit", :to => redirect(:path => "/traces/%{id}/edit")
post "/trace/:id/delete" => "traces#delete", :id => /\d+/
get "/user/:display_name/diary" => "diary_entry#list"
get "/diary/:language" => "diary_entry#list"
get "/diary" => "diary_entry#list"
- get "/user/:display_name/diary/:id" => "diary_entry#view", :id => /\d+/, :as => :diary_entry
+ get "/user/:display_name/diary/:id" => "diary_entry#show", :id => /\d+/, :as => :diary_entry
post "/user/:display_name/diary/:id/newcomment" => "diary_entry#comment", :id => /\d+/
match "/user/:display_name/diary/:id/edit" => "diary_entry#edit", :via => [:get, :post], :id => /\d+/
post "/user/:display_name/diary/:id/hide" => "diary_entry#hide", :id => /\d+/, :as => :hide_diary_entry
post "/user/:display_name/diary/:id/unsubscribe" => "diary_entry#unsubscribe", :as => :diary_entry_unsubscribe, :id => /\d+/
# user pages
- get "/user/:display_name" => "user#view", :as => "user"
+ get "/user/:display_name" => "user#show", :as => "user"
match "/user/:display_name/make_friend" => "user#make_friend", :via => [:get, :post], :as => "make_friend"
match "/user/:display_name/remove_friend" => "user#remove_friend", :via => [:get, :post], :as => "remove_friend"
match "/user/:display_name/account" => "user#account", :via => [:get, :post]
)
assert_routing(
{ :path => "/user/username/diary/1", :method => :get },
- { :controller => "diary_entry", :action => "view", :display_name => "username", :id => "1" }
+ { :controller => "diary_entry", :action => "show", :display_name => "username", :id => "1" }
)
assert_routing(
{ :path => "/user/username/diary/1/edit", :method => :get },
assert_select "h2", :text => "No entry with the id: 9999", :count => 1
end
- # Verify that you get redirected to view if you are not the user
+ # Verify that you get redirected to show if you are not the user
# that created the entry
get :edit,
:params => { :display_name => entry.user.display_name, :id => entry.id },
:session => { :user => other_user }
assert_response :redirect
- assert_redirected_to :action => :view, :display_name => entry.user.display_name, :id => entry.id
+ assert_redirected_to :action => :show, :display_name => entry.user.display_name, :id => entry.id
# Now pass the id, and check that you can edit it, when using the same
# user as the person who created the entry
:longitude => new_longitude, :language_code => new_language_code } },
:session => { :user => entry.user.id }
assert_response :redirect
- assert_redirected_to :action => :view, :display_name => entry.user.display_name, :id => entry.id
+ assert_redirected_to :action => :show, :display_name => entry.user.display_name, :id => entry.id
# Now check that the new data is rendered, when logged in
- get :view,
+ get :show,
:params => { :display_name => entry.user.display_name, :id => entry.id },
:session => { :user => entry.user }
assert_response :success
- assert_template "diary_entry/view"
+ assert_template "diary_entry/show"
assert_select "title", :text => /Users' diaries | /, :count => 1
assert_select "div.content-heading", :count => 1 do
assert_select "h2", :text => /#{entry.user.display_name}'s diary/, :count => 1
end
# and when not logged in as the user who wrote the entry
- get :view,
+ get :show,
:params => { :display_name => entry.user.display_name, :id => entry.id },
:session => { :user => create(:user) }
assert_response :success
- assert_template "diary_entry/view"
+ assert_template "diary_entry/show"
assert_select "title", :text => /Users' diaries | /, :count => 1
assert_select "div.content-heading", :count => 1 do
assert_select "h2", :text => /#{entry.user.display_name}'s diary/, :count => 1
end
end
assert_response :success
- assert_template :view
+ assert_template :show
# Now try again with the right id
assert_difference "ActionMailer::Base.deliveries.size", entry.subscribers.count do
end
end
assert_response :redirect
- assert_redirected_to :action => :view, :display_name => entry.user.display_name, :id => entry.id
+ assert_redirected_to :action => :show, :display_name => entry.user.display_name, :id => entry.id
email = ActionMailer::Base.deliveries.first
assert_equal [user.email], email.to
assert_equal "[OpenStreetMap] #{other_user.display_name} commented on a diary entry", email.subject
assert_equal other_user.id, comment.user_id
assert_equal "New comment", comment.body
- # Now view the diary entry, and check the new comment is present
- get :view,
+ # Now show the diary entry, and check the new comment is present
+ get :show,
:params => { :display_name => entry.user.display_name, :id => entry.id }
assert_response :success
assert_select ".diary-comment", :count => 1 do
end
end
assert_response :redirect
- assert_redirected_to :action => :view, :display_name => entry.user.display_name, :id => entry.id
+ assert_redirected_to :action => :show, :display_name => entry.user.display_name, :id => entry.id
email = ActionMailer::Base.deliveries.first
assert_equal [user.email], email.to
assert_equal "[OpenStreetMap] #{other_user.display_name} commented on a diary entry", email.subject
assert_response :redirect
assert_redirected_to :controller => :user, :action => :suspended
- # Now view the diary entry, and check the new comment is not present
- get :view,
+ # Now show the diary entry, and check the new comment is not present
+ get :show,
:params => { :display_name => entry.user.display_name, :id => entry.id }
assert_response :success
assert_select ".diary-comment", :count => 0
assert_match "<title><script></title>", response.body
end
- def test_view
+ def test_show
user = create(:user)
suspended_user = create(:user, :suspended)
deleted_user = create(:user, :deleted)
# Try a normal entry that should work
diary_entry = create(:diary_entry, :user => user)
- get :view, :params => { :display_name => user.display_name, :id => diary_entry.id }
+ get :show, :params => { :display_name => user.display_name, :id => diary_entry.id }
assert_response :success
- assert_template :view
+ assert_template :show
# Try a deleted entry
diary_entry_deleted = create(:diary_entry, :user => user, :visible => false)
- get :view, :params => { :display_name => user.display_name, :id => diary_entry_deleted.id }
+ get :show, :params => { :display_name => user.display_name, :id => diary_entry_deleted.id }
assert_response :not_found
# Try an entry by a suspended user
diary_entry_suspended = create(:diary_entry, :user => suspended_user)
- get :view, :params => { :display_name => suspended_user.display_name, :id => diary_entry_suspended.id }
+ get :show, :params => { :display_name => suspended_user.display_name, :id => diary_entry_suspended.id }
assert_response :not_found
# Try an entry by a deleted user
diary_entry_deleted = create(:diary_entry, :user => deleted_user)
- get :view, :params => { :display_name => deleted_user.display_name, :id => diary_entry_deleted.id }
+ get :show, :params => { :display_name => deleted_user.display_name, :id => diary_entry_deleted.id }
assert_response :not_found
end
- def test_view_hidden_comments
+ def test_show_hidden_comments
# Get a diary entry that has hidden comments
user = create(:user)
diary_entry = create(:diary_entry, :user => user)
deleted_user_comment = create(:diary_comment, :diary_entry => diary_entry, :user => create(:user, :deleted))
hidden_comment = create(:diary_comment, :diary_entry => diary_entry, :visible => false)
- get :view, :params => { :display_name => user.display_name, :id => diary_entry.id }
+ get :show, :params => { :display_name => user.display_name, :id => diary_entry.id }
assert_response :success
- assert_template :view
+ assert_template :show
assert_select "div.comments" do
assert_select "p#comment#{visible_comment.id}", :count => 1
assert_select "p#comment#{suspended_user_comment.id}", :count => 0
:params => { :display_name => user.display_name, :id => diary_entry.id },
:session => { :user => user }
assert_response :redirect
- assert_redirected_to :action => :view, :display_name => user.display_name, :id => diary_entry.id
+ assert_redirected_to :action => :show, :display_name => user.display_name, :id => diary_entry.id
assert_equal true, DiaryEntry.find(diary_entry.id).visible
# Finally try as an administrator
:params => { :display_name => user.display_name, :id => diary_entry.id, :comment => diary_comment.id },
:session => { :user => user }
assert_response :redirect
- assert_redirected_to :action => :view, :display_name => user.display_name, :id => diary_entry.id
+ assert_redirected_to :action => :show, :display_name => user.display_name, :id => diary_entry.id
assert_equal true, DiaryComment.find(diary_comment.id).visible
# Finally try as an administrator
:params => { :display_name => user.display_name, :id => diary_entry.id, :comment => diary_comment.id },
:session => { :user => administrator_user }
assert_response :redirect
- assert_redirected_to :action => :view, :display_name => user.display_name, :id => diary_entry.id
+ assert_redirected_to :action => :show, :display_name => user.display_name, :id => diary_entry.id
assert_equal false, DiaryComment.find(diary_comment.id).visible
end
assert_routing(
{ :path => "/user/username", :method => :get },
- { :controller => "user", :action => "view", :display_name => "username" }
+ { :controller => "user", :action => "show", :display_name => "username" }
)
assert_routing(
# Check that the user account page will display and contains some relevant
# information for the user
- def test_view
+ def test_show
# Test a non-existent user
- get :view, :params => { :display_name => "unknown" }
+ get :show, :params => { :display_name => "unknown" }
assert_response :not_found
# Test a normal user
user = create(:user)
- get :view, :params => { :display_name => user.display_name }
+ get :show, :params => { :display_name => user.display_name }
assert_response :success
assert_select "div#userinformation" do
assert_select "a[href^='/user/#{ERB::Util.u(user.display_name)}/history']", 1
# Test a user who has been blocked
blocked_user = create(:user)
create(:user_block, :user => blocked_user)
- get :view, :params => { :display_name => blocked_user.display_name }
+ get :show, :params => { :display_name => blocked_user.display_name }
assert_response :success
assert_select "div#userinformation" do
assert_select "a[href^='/user/#{ERB::Util.u(blocked_user.display_name)}/history']", 1
# Test a moderator who has applied blocks
moderator_user = create(:moderator_user)
create(:user_block, :creator => moderator_user)
- get :view, :params => { :display_name => moderator_user.display_name }
+ get :show, :params => { :display_name => moderator_user.display_name }
assert_response :success
assert_select "div#userinformation" do
assert_select "a[href^='/user/#{ERB::Util.u(moderator_user.display_name)}/history']", 1
session[:user] = user.id
# Test the normal user
- get :view, :params => { :display_name => user.display_name }
+ get :show, :params => { :display_name => user.display_name }
assert_response :success
assert_select "div#userinformation" do
assert_select "a[href^='/user/#{ERB::Util.u(user.display_name)}/history']", 1
session[:user] = create(:moderator_user).id
# Test the normal user
- get :view, :params => { :display_name => user.display_name }
+ get :show, :params => { :display_name => user.display_name }
assert_response :success
assert_select "div#userinformation" do
assert_select "a[href^='/user/#{ERB::Util.u(user.display_name)}/history']", 1
seen_user = create(:user, :terms_seen => true)
not_seen_user = create(:user, :terms_seen => false)
- get :view, :params => { :display_name => agreed_user.display_name }
+ get :show, :params => { :display_name => agreed_user.display_name }
assert_response :success
assert_select "div#userinformation" do
assert_select "p", :count => 0, :text => /Contributor terms/
end
- get :view, :params => { :display_name => seen_user.display_name }
+ get :show, :params => { :display_name => seen_user.display_name }
assert_response :success
# put @response.body
assert_select "div#userinformation" do
assert_select "p", /Declined/
end
- get :view, :params => { :display_name => not_seen_user.display_name }
+ get :show, :params => { :display_name => not_seen_user.display_name }
assert_response :success
assert_select "div#userinformation" do
assert_select "p", :count => 1, :text => /Contributor terms/
# Now try as a normal user
get :set_status, :params => { :display_name => user.display_name, :status => "suspended" }, :session => { :user => user }
assert_response :redirect
- assert_redirected_to :action => :view, :display_name => user.display_name
+ assert_redirected_to :action => :show, :display_name => user.display_name
# Finally try as an administrator
get :set_status, :params => { :display_name => user.display_name, :status => "suspended" }, :session => { :user => create(:administrator_user) }
assert_response :redirect
- assert_redirected_to :action => :view, :display_name => user.display_name
+ assert_redirected_to :action => :show, :display_name => user.display_name
assert_equal "suspended", User.find(user.id).status
end
# Now try as a normal user
get :delete, :params => { :display_name => user.display_name, :status => "suspended" }, :session => { :user => user }
assert_response :redirect
- assert_redirected_to :action => :view, :display_name => user.display_name
+ assert_redirected_to :action => :show, :display_name => user.display_name
# Finally try as an administrator
get :delete, :params => { :display_name => user.display_name, :status => "suspended" }, :session => { :user => create(:administrator_user) }
assert_response :redirect
- assert_redirected_to :action => :view, :display_name => user.display_name
+ assert_redirected_to :action => :show, :display_name => user.display_name
# Check that the user was deleted properly
user.reload
assert_response :redirect
follow_redirect!
assert_response :success
- assert_template "user/view"
+ assert_template "user/show"
get "/user/#{ERB::Util.u(user.display_name)}/account"
assert_response :success
assert_template "user/account"
target_user = create(:user)
post "/user/#{ERB::Util.u(target_user.display_name)}/role/#{role}/#{action}"
- assert_redirected_to :controller => "user", :action => "view", :display_name => target_user.display_name
+ assert_redirected_to user_path(target_user)
reset!
end
target_user = create(:user)
post "/user/#{ERB::Util.u(target_user.display_name)}/role/#{role}/#{action}"
- assert_redirected_to :controller => "user", :action => "view", :display_name => target_user.display_name
+ assert_redirected_to user_path(target_user)
reset!
end
visit browse_note_path(note)
assert page.has_content?(note.comments.first.body)
- assert_not page.has_content?(I18n.t("user.view.report"))
+ assert_not page.has_content?(I18n.t("user.show.report"))
end
def test_can_report_user
sign_in_as(create(:user))
visit user_path(user.display_name)
- click_on I18n.t("user.view.report")
+ click_on I18n.t("user.show.report")
assert page.has_content? "Report"
assert page.has_content? I18n.t("reports.new.disclaimer.intro")
sign_in_as(create(:user))
visit user_path(user.display_name)
- click_on I18n.t("user.view.report")
+ click_on I18n.t("user.show.report")
assert page.has_content? "Report"
assert page.has_content? I18n.t("reports.new.disclaimer.intro")
visit user_path(user.display_name)
- click_on I18n.t("user.view.report")
+ click_on I18n.t("user.show.report")
assert page.has_content? "Report"
assert page.has_content? I18n.t("reports.new.disclaimer.intro")